[jboss-cvs] JBossAS SVN: r64290 - projects/security/security-jboss-sx/trunk.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 26 02:23:53 EDT 2007
Author: anil.saldhana at jboss.com
Date: 2007-07-26 02:23:53 -0400 (Thu, 26 Jul 2007)
New Revision: 64290
Modified:
projects/security/security-jboss-sx/trunk/pom.xml
Log:
upgrade jbossxb, move client jar creation to a separate sub project
Modified: projects/security/security-jboss-sx/trunk/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/pom.xml 2007-07-26 06:20:49 UTC (rev 64289)
+++ projects/security/security-jboss-sx/trunk/pom.xml 2007-07-26 06:23:53 UTC (rev 64290)
@@ -43,7 +43,7 @@
<releases>
<enabled>false</enabled>
</releases>
- </repository>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -55,34 +55,41 @@
<enabled>false</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>Maven Snapshots</id>
- <url>http://snapshots.maven.codehaus.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>LSU ibiblio</id>
- <url>http://ibiblio.lsu.edu/main/pub/packages/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
+ </pluginRepository>
</pluginRepositories>
<build>
<sourceDirectory>src/main</sourceDirectory>
<testSourceDirectory>src/tests</testSourceDirectory>
<testOutputDirectory>target/test-classes</testOutputDirectory>
<finalName>${artifactId}</finalName>
- <outputDirectory>output/classes</outputDirectory>
+ <outputDirectory>target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/resources</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ <include>**/*.xsd</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>target/generated-sources/javacc</directory>
+ <includes>
+ <include>**/*.class</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>target/generated-sources/jaxb</directory>
+ <includes>
+ <include>**/*.class</include>
+ </includes>
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>src/tests/resources/</directory>
@@ -110,6 +117,20 @@
<id>javacc</id>
</execution>
</executions>
+ </plugin>
+
+ <!-- define that we wish to create src jars -->
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0</version>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -126,82 +147,30 @@
<forkMode>pertest</forkMode>
</configuration>
</plugin>
- <!-- define that we wish to create src jars -->
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0</version>
- <inherited>true</inherited>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jboss-deploy-plugin</artifactId>
+ <version>1.3</version>
<executions>
<execution>
<goals>
- <goal>jar</goal>
+ <goal>jboss-deploy</goal>
</goals>
</execution>
</executions>
+ <configuration>
+ <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
+ </configuration>
</plugin>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>buildjar</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <mkdir dir="${basedir}/output/lib"/>
- <copy todir="${basedir}/output/classes">
- <fileset dir="${basedir}/src/main">
- <include name="org/jboss/security/jacc/*.xml"/>
- </fileset>
- </copy>
- <!-- Build jbosssx.jar -->
- <jar jarfile="${basedir}/output/lib/jbosssx.jar" manifest="${basedir}/src/etc/default.mf">
- <fileset dir="${basedir}/output/classes"/>
- <fileset dir="${basedir}/src/resources">
- <include name="dtd/security-policy.dtd"/>
- </fileset>
- <fileset file="${basedir}/JBossORG-EULA.txt"/>
- </jar>
- <!-- Build jbosssx-client.jar -->
- <jar jarfile="${basedir}/output/lib/jbosssx-client.jar" manifest="${basedir}/src/etc/default.mf">
- <fileset dir="${basedir}/output/classes">
- <exclude name="META-INF/MANIFEST.MF"/>
- <!-- HACK -->
- <include name="org/jboss/crypto/JBossSXProvider.class"/>
- <include name="org/jboss/crypto/digest/*"/>
- <include name="org/jboss/security/*"/>
- <include name="org/jboss/security/auth/callback/*"/>
- <include name="org/jboss/security/auth/login/*"/>
- <include name="org/jboss/security/client/*"/>
- <exclude name="org/jboss/security/auth/login/XMLLoginConfig.class"/>
- <exclude name="org/jboss/security/auth/login/XMLLoginConfigMBean.class"/>
- <include name="org/jboss/security/jndi/LoginInitialContextFactory.class"/>
- <include name="org/jboss/security/jndi/JndiLoginInitialContextFactory.class"/>
- <include name="org/jboss/security/plugins/PBEUtils.class"/>
- <include name="org/jboss/security/ssl/ClientSocketFactory.class"/>
- <include name="org/jboss/security/ssl/RMISSLClientSocketFactory.class"/>
- <include name="org/jboss/security/plugins/*SecurityContext*.class"/>
- </fileset>
- <fileset file="${basedir}/JBossORG-EULA.txt"/>
- </jar>
- <!-- Build jbosssx-tests.jar -->
- <mkdir dir="${basedir}/output/test/lib"/>
- <jar jarfile="${basedir}/output/test/lib/jbosssx-tests.jar" manifest="${basedir}/src/etc/default.mf">
- <fileset dir="${basedir}/output/classes">
- <include name="org/jboss/test/TestLoginModule.class"/>
- </fileset>
- <fileset file="${basedir}/JBossORG-EULA.txt"/>
- </jar>
- <!-- Build the source jar -->
- <jar jarfile="${basedir}/output/lib/jbosssx-sources.jar" manifest="${basedir}/src/etc/default.mf">
- <fileset dir="${basedir}/src/main"/>
- <fileset file="${basedir}/JBossORG-EULA.txt"/>
- </jar>
- </tasks>
- </configuration>
+ <id>build-classpath</id>
+ <phase>generate-sources</phase>
<goals>
- <goal>run</goal>
+ <goal>build-classpath</goal>
</goals>
</execution>
</executions>
@@ -223,19 +192,9 @@
</plugin>
</plugins>
</reporting>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-javaee</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>2.0.2.GA</version>
</dependency>
@@ -258,7 +217,7 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jbossxb</artifactId>
- <version>1.0.0.CR8</version>
+ <version>2.0.0.CR3</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
@@ -295,5 +254,10 @@
<artifactId>mail</artifactId>
<version>1.4</version>
</dependency>
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
</dependencies>
</project>
More information about the jboss-cvs-commits
mailing list