Skip to content
GitLab
Commit 1880e6ac authored by Andre Freyssinet's avatar Andre Freyssinet
Browse files

Adds Jakarta packages to assembly and release.

parent 3ed2e19c
Hide whitespace changes
Inline Side-by-side
joram/assembly/client-assembly.xml
View file @ 1880e6ac
......@@ -23,13 +23,11 @@
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>jakarta.jms:jakarta.jms-api</include>
<include>org.ow2.spec.ee:ow2-jms-2.0-spec</include>
<include>org.ow2.spec.ee:ow2-jta-1.1-spec</include>
<include>org.objectweb.joram:jcup</include>
<include>org.ow2.joram:joram-shared</include>
<include>org.ow2.joram:joram-client-jms</include>
<include>org.ow2.joram:joram-client-jakarta</include>
<include>org.ow2.joram:a3-common</include>
<include>org.ow2.joram:jndi-shared</include>
<include>org.ow2.joram:jndi-client</include>
......
joram/assembly/jakarta-assembly.xml 0 → 100644
View file @ 1880e6ac
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>jakarta</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>jar</format>
</formats>
<fileSets>
<fileSet>
<directory>.</directory>
<outputDirectory>.</outputDirectory>
<lineEnding>unix</lineEnding>
<fileMode>0744</fileMode>
<includes>
<include>a3debug.cfg</include>
</includes>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>jakarta.jms:jakarta.jms-api</include>
<include>org.ow2.spec.ee:ow2-jta-1.1-spec</include>
<include>org.objectweb.joram:jcup</include>
<include>org.ow2.joram:joram-shared</include>
<include>org.ow2.joram:joram-jakarta-jms</include>
<include>org.ow2.joram:a3-common</include>
<include>org.ow2.joram:jndi-shared</include>
<include>org.ow2.joram:jndi-client</include>
</includes>
<useTransitiveFiltering>false</useTransitiveFiltering>
<useProjectArtifact>false</useProjectArtifact>
<unpack>true</unpack>
</dependencySet>
</dependencySets>
</assembly>
joram/assembly/osgi-assembly.xml
View file @ 1880e6ac
......@@ -35,7 +35,7 @@
<include>org.ow2.joram:joram-shared</include>
<include>org.ow2.joram:joram-mom-core</include>
<include>org.ow2.joram:joram-client-jms</include>
<include>org.ow2.joram:joram-client-jakarta</include>
<include>org.ow2.joram:joram-jakarta-jms</include>
<include>org.ow2.joram:a3-common</include>
<include>org.ow2.joram:a3-rt</include>
<include>org.ow2.joram:a3-osgi</include>
......@@ -116,6 +116,7 @@
<include>javax.activation:activation</include>
<include>org.ow2.spec.ee:ow2-connector-1.5-spec</include>
<include>javax.mail:mail</include>
<include>org.ow2.joram:joram-jakarta-jca</include>
<include>org.ow2.joram:joram-client-jca</include>
<!-- Adds jmstool -->
<include>org.ow2.joram:joram-tools-jmstool:jar:jar-with-dependencies</include>
......
joram/assembly/pom.xml
View file @ 1880e6ac
......@@ -37,26 +37,47 @@
</configuration>
</execution>
<!-- ============= client (joram) ===================== -->
<execution>
<id>client</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>client-assembly.xml</descriptor>
</descriptors>
<archive>
<manifest>
<mainClass>org.objectweb.joram.client.jms.admin.AdminModule</mainClass>
</manifest>
</archive>
<appendAssemblyId>true</appendAssemblyId>
<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
</configuration>
</execution>
<!-- ============= client (joram) ===================== -->
<execution>
<id>client</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>client-assembly.xml</descriptor>
</descriptors>
<archive>
<manifest>
<mainClass>org.objectweb.joram.client.jms.admin.AdminModule</mainClass>
</manifest>
</archive>
<appendAssemblyId>true</appendAssemblyId>
<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
</configuration>
</execution>
<!-- ============= Jakarta client (joram) ===================== -->
<execution>
<id>jakarta</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>jakarta-assembly.xml</descriptor>
</descriptors>
<archive>
<manifest>
<mainClass>org.ow2.joram.jakarta.jms.admin.AdminModule</mainClass>
</manifest>
</archive>
<appendAssemblyId>true</appendAssemblyId>
<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
......@@ -100,7 +121,13 @@
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-client-jakarta</artifactId>
<artifactId>joram-jakarta-jms</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jakarta-jca</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
......@@ -109,6 +136,12 @@
<artifactId>joram-client-jms</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-client-jca</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
......@@ -306,12 +339,6 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-client-jca</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>licenses</artifactId>
......@@ -366,7 +393,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<!-- Jersey -->
......
joram/release/pom.xml
View file @ 1880e6ac
......@@ -135,6 +135,16 @@
<artifactId>joram-client-jca</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jakarta-jms</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jakarta-jca</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jca-jonas</artifactId>
......@@ -266,6 +276,16 @@
<artifactId>joram-client-jca</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jakarta-jms</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jakarta-jca</artifactId>
<version>${project.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jca-jonas</artifactId>
......@@ -432,6 +452,24 @@
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-client-jca</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jakarta-jms</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-jakarta-jca</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>a3-common</artifactId>
......@@ -597,12 +635,6 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>joram-client-jca</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.joram</groupId>
<artifactId>licenses</artifactId>
......@@ -644,6 +676,12 @@
<artifactId>substitution</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<!-- Jersey -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
......
joram/release/raconfig-assembly.xml
View file @ 1880e6ac
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>raconfig</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<dependencySets>
<dependencySet>
<outputDirectory>/ship/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <!-- ow_monolog.jar -->
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.ow2.jonas.osgi:monolog</include>
</includes>
<unpack>false</unpack>
</dependencySet>
<dependencySet>
<outputDirectory>/ship/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.ow2.joram:joram-client-jca</include>
</includes>
<unpack>false</unpack>
<unpackOptions>
<!-- <includes>-->
<!-- <include>**/utils/*.class</include>-->
<!-- </includes>-->
<excludes>
<exclude>**/connector/*.class</exclude>
</excludes>
</unpackOptions>
</dependencySet>
</dependencySets>
<files>
<file>
<source>../joram/client/jca/src/main/resources/org/objectweb/joram/client/connector/utils/raconfig.bat</source>
<outputDirectory>/ship/bin</outputDirectory>
<destName>raconfig.bat</destName>
<fileMode>0644</fileMode>
</file>
<file>
<source>../joram/client/jca/src/main/resources/org/objectweb/joram/client/connector/utils/raconfig.sh</source>
<outputDirectory>/ship/bin</outputDirectory>
<destName>raconfig.sh</destName>
<fileMode>0644</fileMode>
</file>
</files>
</assembly>
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>raconfig</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<dependencySets>
<!-- <dependencySet>
<outputDirectory>/ship/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> ow_monolog.jar
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.ow2.jonas.osgi:monolog</include>
</includes>
<unpack>false</unpack>
</dependencySet> -->
<dependencySet>
<outputDirectory>/ship/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.ow2.joram:joram-client-jca</include>
<include>org.ow2.joram:joram-jakarta-jca</include>
</includes>
<unpack>false</unpack>
<unpackOptions>
<!-- <includes>-->
<!-- <include>**/utils/*.class</include>-->
<!-- </includes>-->
<excludes>
<exclude>**/connector/*.class</exclude>
</excludes>
</unpackOptions>
</dependencySet>
</dependencySets>
<files>
<file>
<source>../joram/client/jca/src/main/resources/org/objectweb/joram/client/connector/utils/raconfig.bat</source>
<outputDirectory>/ship/bin</outputDirectory>
<destName>jms-raconfig.bat</destName>
<fileMode>0644</fileMode>
</file>
<file>
<source>../joram/client/jca/src/main/resources/org/objectweb/joram/client/connector/utils/raconfig.sh</source>
<outputDirectory>/ship/bin</outputDirectory>
<destName>jms-raconfig.sh</destName>
<fileMode>0644</fileMode>
</file>
<file>
<source>../joram/jakarta/jca/src/main/resources/org/ow2/joram/jakarta/connector/utils/raconfig.bat</source>
<outputDirectory>/ship/bin</outputDirectory>
<destName>jakarta-raconfig.bat</destName>
<fileMode>0644</fileMode>
</file>
<file>
<source>../joram/jakarta/jca/src/main/resources/org/ow2/joram/jakarta/connector/utils/raconfig.sh</source>
<outputDirectory>/ship/bin</outputDirectory>
<destName>jakarta-raconfig.sh</destName>
<fileMode>0644</fileMode>
</file>
</files>
</assembly>
joram/release/samples-assembly.xml
View file @ 1880e6ac
......@@ -36,6 +36,7 @@
<include>org.ow2.joram:joram-shared</include>
<include>org.ow2.joram:joram-mom-core</include>
<include>org.ow2.joram:joram-client-jms</include>
<include>org.ow2.joram:joram-jakarta-jms</include>
<include>org.ow2.joram:a3-common</include>
<include>org.ow2.joram:a3-rt</include>
<include>org.ow2.joram:a3-osgi</include>
......@@ -120,6 +121,7 @@
<include>org.ow2.spec.ee:ow2-connector-1.5-spec</include>
<include>javax.mail:mail</include>
<include>org.ow2.joram:joram-client-jca</include>
<include>org.ow2.joram:joram-jakarta-jca</include>
</includes>
<unpack>false</unpack>
</dependencySet>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment