[jboss-cvs] JBossAS SVN: r83718 - in trunk: build and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 30 19:31:34 EST 2009
Author: pgier
Date: 2009-01-30 19:31:34 -0500 (Fri, 30 Jan 2009)
New Revision: 83718
Removed:
trunk/deployment/component-info.xml
trunk/server/component-info.xml
Modified:
trunk/build/build.xml
trunk/deployment/pom.xml
trunk/pom.xml
trunk/security/pom.xml
trunk/server/pom.xml
trunk/server/src/assembly/client.xml
Log:
[JBBUILD-506] Switch security, server, and deployment modules to maven.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2009-01-30 23:32:40 UTC (rev 83717)
+++ trunk/build/build.xml 2009-01-31 00:31:34 UTC (rev 83718)
@@ -92,7 +92,7 @@
<module name="cluster"/>
<module name="connector"/>
<module name="console"/>
- <module name="deployment"/>
+ <module name="deployment" externalBuild="true"/>
<module name="ejb3"/>
<module name="embedded"/>
<module name="hibernate-int"/>
@@ -107,8 +107,8 @@
<module name="jmx-remoting"/>
<module name="jbossas/jmx-remoting"/>
<module name="profileservice"/>
- <module name="security"/>
- <module name="server"/>
+ <module name="security" externalBuild="true"/>
+ <module name="server" externalBuild="true"/>
<module name="spring-int"/>
<module name="system" externalBuild="true"/>
<module name="system-jmx" externalBuild="true"/>
Deleted: trunk/deployment/component-info.xml
===================================================================
--- trunk/deployment/component-info.xml 2009-01-30 23:32:40 UTC (rev 83717)
+++ trunk/deployment/component-info.xml 2009-01-31 00:31:34 UTC (rev 83718)
@@ -1,26 +0,0 @@
-<project name="deployment-component-info">
-
- <!-- ============================================================ -->
- <!-- Deployment -->
- <!-- ============================================================ -->
- <component id="deployment"
- module="jboss-deployment"
- version="5.0-SNAPSHOT"
- specTitle="J2EE Deployment API"
- specVersion="Sun Microsystems"
- specVendor="1.1"
- implTitle="JBoss JSR-88 Deployment API"
- implURL="http://www.jboss.org"
- implVersion="1.1-DEV"
- implVendor="JBoss"
- >
- <artifact id="jboss-deployment.jar"/>
- <artifact id="jboss-jsr88.jar"/>
- <artifact id="jsr88-service.xml"/>
-
- <export>
- <include input="jboss-deployment.jar"/>
- </export>
-
- </component>
-</project>
\ No newline at end of file
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2009-01-30 23:32:40 UTC (rev 83717)
+++ trunk/deployment/pom.xml 2009-01-31 00:31:34 UTC (rev 83718)
@@ -53,6 +53,57 @@
<descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-output</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+
+ <mkdir dir="output/etc"/>
+ <copy todir="output/etc" filtering="yes">
+ <fileset dir="src/etc">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="output/lib"/>
+ <copy file="target/${artifactId}-${version}.jar"
+ tofile="output/lib/jboss-deployment.jar"/>
+ <copy file="target/${artifactId}-${version}-jboss-jsr88.jar"
+ tofile="output/lib/jboss-jsr88.jar"/>
+
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-output</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>clean</phase>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>output</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-01-30 23:32:40 UTC (rev 83717)
+++ trunk/pom.xml 2009-01-31 00:31:34 UTC (rev 83718)
@@ -438,6 +438,9 @@
<module>jmx</module>
<module>system</module>
<module>system-jmx</module>
+ <module>security</module>
+ <module>server</module>
+ <module>deployment</module>
</modules>
</profile>
Modified: trunk/security/pom.xml
===================================================================
--- trunk/security/pom.xml 2009-01-30 23:32:40 UTC (rev 83717)
+++ trunk/security/pom.xml 2009-01-31 00:31:34 UTC (rev 83718)
@@ -36,6 +36,57 @@
<descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-output</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+
+ <mkdir dir="output/etc"/>
+ <copy todir="output/etc" filtering="yes">
+ <fileset dir="src/etc">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="output/lib"/>
+ <copy file="target/${artifactId}-${version}.jar"
+ tofile="output/lib/jbosssx-server.jar"/>
+ <copy file="target/${artifactId}-${version}-client.jar"
+ tofile="output/lib/jbosssx-as-client.jar"/>
+
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-output</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>clean</phase>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>output</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
Deleted: trunk/server/component-info.xml
===================================================================
--- trunk/server/component-info.xml 2009-01-30 23:32:40 UTC (rev 83717)
+++ trunk/server/component-info.xml 2009-01-31 00:31:34 UTC (rev 83718)
@@ -1,123 +0,0 @@
-<project name="server-component-info">
- <!-- ============================================================ -->
- <!-- Server -->
- <!-- ============================================================ -->
-
- <component id="server"
- module="jboss"
- version="5.0-SNAPSHOT"
- >
- <!-- lib -->
- <artifact id="jboss.jar"/>
- <artifact id="jmx-adaptor-plugin.jar"/>
- <artifact id="jboss-minimal.jar"/>
- <artifact id="jboss-client.jar"/>
- <artifact id="jboss-metamodel.jar"/>
-
- <!-- deploy -->
- <artifact id="uuid-key-generator.sar"/>
- <artifact id="sqlexception-service.xml" outputpath="resources/exception-processor"/>
- <artifact id="client-deployer-service.xml" outputpath="resources/client-deployer"/>
- <artifact id="jboss-service.xml" outputpath="resources/jmx-invoker-adaptor/META-INF" />
- <artifact id="cache-invalidation-service.xml" outputpath="etc/deploy"/>
- <artifact id="ear-deployer.xml" outputpath="etc/deploy"/>
- <artifact id="ejb-deployer.xml" outputpath="etc/deploy"/>
-
- <!-- conf -->
- <artifact id="jboss-minimal.xml" outputpath="etc/conf/default"/>
- <artifact id="conf-jboss-service.xml" filename="jboss-service.xml" outputpath="resources/jmx-invoker-adaptor/META-INF"/>
- <artifact id="jndi.properties" outputpath="etc/conf/default"/>
- <artifact id="log4j.xml" outputpath="etc/conf/default"/>
- <artifact id="login-config.xml" outputpath="etc/conf/default"/>
- <artifact id="server.policy" outputpath="etc/conf/default"/>
- <artifact id="standardjaws.xml" outputpath="etc/conf/default"/>
- <artifact id="standardjboss.xml" outputpath="etc/conf/default"/>
- <artifact id="standardjbosscmp-jdbc.xml" outputpath="etc/conf/default"/>
- <artifact id="AttributePersistenceService-xmbean.xml" outputpath="etc/conf/default/xmdesc"/>
- <artifact id="ClientUserTransaction-xmbean.xml" outputpath="etc/conf/default/xmdesc"/>
- <artifact id="JNDIView-xmbean.xml" outputpath="etc/conf/default/xmdesc"/>
- <artifact id="Log4jService-xmbean.xml" outputpath="etc/conf/default/xmdesc"/>
- <artifact id="NamingService-xmbean.xml" outputpath="etc/conf/default/xmdesc"/>
- <artifact id="TransactionManagerService-xmbean.xml" outputpath="etc/conf/default/xmdesc"/>
- <artifact id="org.jboss.deployment.MainDeployer-xmbean.xml" outputpath="etc/conf/default/xmdesc"/>
- <artifact id="org.jboss.deployment.SARDeployer-xmbean.xml" outputpath="etc/conf/default/xmdesc"/>
- <artifact id="org.jboss.deployment.JARDeployer-xmbean.xml" outputpath="etc/conf/default/xmdesc"/>
- <artifact id="jmx-console-roles.properties" />
- <artifact id="jmx-console-users.properties" />
-
-
- <!-- dtd -->
- <artifact id="XMLSchema.dtd"/>
- <artifact id="application-client_1_3.dtd"/>
- <artifact id="application_1_2.dtd"/>
- <artifact id="application_1_3.dtd"/>
- <artifact id="connector_1_0.dtd"/>
- <artifact id="datatypes.dtd"/>
- <artifact id="ejb-jar.dtd"/>
- <artifact id="ejb-jar_2_0.dtd"/>
- <artifact id="jaws.dtd"/>
- <artifact id="jaws_2_4.dtd"/>
- <artifact id="jaws_3_0.dtd"/>
- <artifact id="jboss-app_3_0.dtd"/>
- <artifact id="jboss-app_3_2.dtd"/>
- <artifact id="jboss-app_4_0.dtd"/>
- <artifact id="jboss-client_3_2.dtd"/>
- <artifact id="jboss-client_4_0.dtd"/>
- <artifact id="jboss-web.dtd"/>
- <artifact id="jboss-web_3_0.dtd"/>
- <artifact id="jboss-web_3_2.dtd"/>
- <artifact id="jboss-web_4_0.dtd"/>
- <artifact id="jboss.dtd"/>
- <artifact id="jboss_2_4.dtd"/>
- <artifact id="jboss_3_0.dtd"/>
- <artifact id="jboss_3_2.dtd"/>
- <artifact id="jboss_4_0.dtd"/>
- <artifact id="jbosscmp-jdbc_3_0.dtd"/>
- <artifact id="jbosscmp-jdbc_3_2.dtd"/>
- <artifact id="jbosscmp-jdbc_4_0.dtd"/>
- <artifact id="security_config.dtd"/>
- <artifact id="web-app_2_2.dtd"/>
- <artifact id="web-app_2_3.dtd"/>
-
- <!-- schema -->
- <artifact id="application-client_1_4.xsd"/>
- <artifact id="application_1_4.xsd"/>
- <artifact id="connector_1_5.xsd"/>
- <artifact id="ejb-jar_2_1.xsd"/>
- <artifact id="j2ee_1_4.xsd"/>
- <artifact id="j2ee_jaxrpc_mapping_1_1.xsd"/>
- <artifact id="j2ee_web_services_1_1.xsd"/>
- <artifact id="j2ee_web_services_client_1_1.xsd"/>
- <artifact id="jsp_2_0.xsd"/>
- <artifact id="security-config_4_0.xsd"/>
- <artifact id="web-app_2_4.xsd"/>
- <artifact id="web-jsptaglibrary_2_0.xsd"/>
- <artifact id="xml.xsd"/>
- <artifact id="java-properties_1_0.xsd"/>
- <artifact id="jbxb_1_0.xsd" />
-
- <!-- bin -->
- <artifact id="deployer.bat"/>
- <artifact id="deployer.sh"/>
- <artifact id="jboss_init_redhat.sh"/>
- <artifact id="jboss_init_suse.sh"/>
- <artifact id="shutdown.bat"/>
- <artifact id="shutdown.sh"/>
- <artifact id="shutdown.jar"/>
-
- <artifact id="verifier.jar"/>
- <artifact id="jboss-security.jar"/>
- <artifact id="server-testsuite-support.jar"/>
- <artifact id="jmx-invoker-adaptor-client.jar"/>
-
- <!--TODO: come up with a better system for directory creation
- -->
- <artifact id="all" artifacttype="dir"/>
- <artifact id="default" artifacttype="dir"/>
-
- <export>
- <include input="jboss.jar"/>
- <include input="jmx-adaptor-plugin.jar"/>
- </export>
- </component>
-</project>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2009-01-30 23:32:40 UTC (rev 83717)
+++ trunk/server/pom.xml 2009-01-31 00:31:34 UTC (rev 83718)
@@ -155,6 +155,131 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-output</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+
+ <!-- Need to copy classes here because varia module
+ - depends on copying some of these classes.
+ - TODO: this can be removed after varia switches to maven.
+ -->
+ <mkdir dir="output/classes"/>
+ <copy todir="output/classes">
+ <fileset dir="target/classes">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <filter token="default.type.mapping" value="Hypersonic SQL"/>
+
+ <property name="build.bin" value="output/bin"/>
+ <mkdir dir="${build.bin}"/>
+ <copy todir="${build.bin}" filtering="yes">
+ <fileset dir="src/bin">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <fixcrlf srcdir="${build.bin}"
+ eol="lf" eof="remove"
+ includes="**/*.sh"/>
+
+ <fixcrlf srcdir="${build.bin}"
+ eol="crlf" eof="remove"
+ includes="**/*.bat, **/*.cmd"/>
+
+ <chmod perm="+x">
+ <fileset dir="${build.bin}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ <mkdir dir="output/etc"/>
+ <copy todir="output/etc" filtering="yes">
+ <fileset dir="src/etc">
+ <include name="**"/>
+ <exclude name="manifest/**"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="output/resources"/>
+ <copy todir="output/resources" filtering="yes">
+ <fileset dir="src/resources">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <property name="build.lib" value="output/lib"/>
+ <mkdir dir="${build.lib}"/>
+ <copy file="target/${artifactId}-${version}-client.jar"
+ tofile="${build.lib}/jboss-client.jar"/>
+ <copy file="target/${artifactId}-${version}-jboss-minimal.jar"
+ tofile="${build.lib}/jboss-minimal.jar"/>
+ <copy file="target/${artifactId}-${version}-jboss.jar"
+ tofile="${build.lib}/jboss.jar"/>
+ <copy file="target/${artifactId}-${version}-jmx-adaptor-plugin.jar"
+ tofile="${build.lib}/jmx-adaptor-plugin.jar"/>
+ <copy file="target/${artifactId}-${version}-jmx-invoker-adaptor-client.jar"
+ tofile="${build.lib}/jmx-invoker-adaptor-client.jar"/>
+ <copy file="target/${artifactId}-${version}-shutdown.jar"
+ tofile="${build.lib}/shutdown.jar"/>
+ <copy file="target/${artifactId}-${version}-testsuite-support.jar"
+ tofile="${build.lib}/testsuite-support.jar"/>
+ <copy file="target/${artifactId}-${version}-verifier.jar"
+ tofile="${build.lib}/verifier.jar"/>
+
+ <!-- uuid-key-generator.sar -->
+ <mkdir dir="${build.lib}/uuid-key-generator.sar"/>
+ <copy todir="${build.lib}/uuid-key-generator.sar">
+ <fileset dir="target/classes">
+ <include name="org/jboss/ejb/plugins/keygenerator/uuid/**"/>
+ </fileset>
+ <fileset dir="target/classes">
+ <include name="org/jboss/ejb/plugins/keygenerator/hilo/**"/>
+ </fileset>
+ <fileset dir="src/resources/uuid-key-generator">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <!-- SQLException Processor -->
+ <copy todir="${build.lib}"
+ file="output/resources/exception-processor/sqlexception-service.xml"/>
+
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-output</id>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <phase>clean</phase>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>output</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: trunk/server/src/assembly/client.xml
===================================================================
--- trunk/server/src/assembly/client.xml 2009-01-30 23:32:40 UTC (rev 83717)
+++ trunk/server/src/assembly/client.xml 2009-01-31 00:31:34 UTC (rev 83718)
@@ -29,6 +29,7 @@
<include>org/jboss/naming/LinkRefPair.class</include>
<include>org/jboss/naming/LinkRefPairObjectFactory.class</include>
<include>org/jboss/naming/*NamingContextFactory*.class</include>
+ <include>org/jboss/naming/DummyConfiguration.class</include>
<include>org/jboss/naming/client/**</include>
<include>org/jboss/naming/interceptors/*</include>
<include>org/jboss/proxy/**</include>
More information about the jboss-cvs-commits
mailing list