brett 2005/03/18 00:29:03
Modified: m2 .cvsignore ejb-group.pom maven2.sh
Added: m2 ejb-assembly.pom ejb-test-ear.pom
Log:
updated m2 build
Revision Changes Path
1.2 +1 -0 openejb/m2/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- .cvsignore 12 Mar 2005 05:50:43 -0000 1.1
+++ .cvsignore 18 Mar 2005 05:29:02 -0000 1.2
@@ -1 +1,2 @@
openejb
+intellij
1.6 +3 -1 openejb/m2/ejb-group.pom
Index: ejb-group.pom
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/ejb-group.pom,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- ejb-group.pom 13 Mar 2005 00:59:53 -0000 1.5
+++ ejb-group.pom 18 Mar 2005 05:29:02 -0000 1.6
@@ -13,8 +13,10 @@
<modules>
<module>modules/core</module>
+ <module>modules/assembly</module>
<module>modules/openejb-builder</module>
<module>modules/test-ejb-jar</module>
+ <module>modules/test-ear</module>
</modules>
<repositories>
1.5 +22 -7 openejb/m2/maven2.sh
Index: maven2.sh
===================================================================
RCS file: /home/projects/openejb/scm/openejb/m2/maven2.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- maven2.sh 18 Mar 2005 02:45:32 -0000 1.4
+++ maven2.sh 18 Mar 2005 05:29:02 -0000 1.5
@@ -5,31 +5,32 @@
poms=`pwd`
modules_dir=$dir/modules
-echo Backing up IntelliJ files
+echo "Backing up IntelliJ files"
rm -rf intellij
mkdir -p intellij
find openejb -name '*.iml' -exec cp --parents {} intellij \;
cp openejb/*.iws intellij/openejb
cp openejb/*.ipr intellij/openejb
-echo Removing old version
+echo "Removing old version"
rm -rf $dir > /dev/null 2>&1
-echo Setting up base
+echo "Setting up base"
mkdir -p $dir > /dev/null 2>&1
cp -r intellij/openejb/* openejb
cp $poms/ejb-group.pom $dir/pom.xml
-echo Setting up modules
+echo "Setting up modules"
mkdir $dir/modules
-echo ... core
+echo "... core"
# TODO: should be ./openejb-core not ./modules/core
cp -r $src/modules/core $modules_dir
cp $poms/ejb-core.pom $modules_dir/core/pom.xml
+echo "... test-ejb-jar"
mv $dir/modules/core/src/test-ejb-jar $modules_dir
cp $poms/ejb-test-jar.pom $modules_dir/test-ejb-jar/pom.xml
@@ -41,13 +42,27 @@
mv META-INF src/main/resources
)
-echo ... builder
+echo "... builder"
cp -r $src/modules/openejb-builder $modules_dir
cp $poms/ejb-builder.pom $modules_dir/openejb-builder/pom.xml
rm -rf $modules_dir/openejb-builder/src/test-ejb-jar
+echo "... test-ear"
+mv $dir/modules/openejb-builder/src/test-ear $modules_dir
+cp $poms/ejb-test-ear.pom $modules_dir/test-ear/pom.xml
+
+(
+ cd $modules_dir/test-ear
+ mkdir -p src/main/resources
+ mv META-INF src/main/resources
+)
+
+echo "... assembly"
+cp -r $src/modules/assembly $modules_dir
+cp $poms/ejb-assembly.pom $modules_dir/assembly/pom.xml
+
# ---------------------------------------------------
-echo Removing CVS directories
+echo "Removing CVS directories"
find $dir -name 'CVS*' -exec rm -rf {} \; > /dev/null 2>&1
1.1 openejb/m2/ejb-assembly.pom
Index: ejb-assembly.pom
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $Revision: 1.1 $ $Date: 2005/03/18 05:29:02 $ -->
<project>
<parent>
<groupId>openejb</groupId>
<artifactId>openejb</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<name>OpenEJB :: Assembly</name>
<artifactId>openejb-assembly</artifactId>
<description>OpenEJB Assembly</description>
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
<dependencies>
<!--
<!- - ========================================================== - ->
<!- - We use the follow properties in this build: - ->
<!- - lib: copy dependency into lib - ->
<!- - server: include dependency in server classpath - ->
<!- - deploy: include dependency in deployer classpath - ->
<!- - repository: copy dependency into repository (Note: all - ->
<!- - OpenEJB jars are always copied to repository) - ->
<!- - ========================================================== - ->
<dependency>
<groupId>openejb</groupId>
<artifactId>openejb-builder</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${pom.currentVersion}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
<version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector-builder</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
<version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
<version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
<version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-derby</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-derby-connector</artifactId>
<version>${geronimo_version}</version>
<type>rar</type>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-jmxremoting</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming-builder</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
<version>${activeio_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security-builder</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-service-builder</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
<version>${geronimo_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-timer</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-webservices</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
<version>${howl_version}</version>
<url>http://forge.objectweb.org/projects/howl</url>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee-deployment</artifactId>
<version>${geronimo_spec_j2ee_deployment_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql-connector</artifactId>
<version>${tranql_connector_version}</version>
<type>rar</type>
</dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>${antlr_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>${ant_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
<version>${xstream_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<url>http://www.extreme.indiana.edu/xgws/xsoap/xpp</url>
<version>${xpp3_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>axion</groupId>
<artifactId>axion</artifactId>
<version>${axion_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
<version>${castor_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
<version>${cglib_version}</version>
<url>http://cglib.sf.net/</url>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
</properties>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${commons_cli_version}</version>
<url>http://jakarta.apache.org/commons/cli/</url>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
</properties>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons_collections_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons_fileupload_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons_logging_version}</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
</properties>
</dependency>
<dependency>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
<version>${commons_primitives_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>${concurrent_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>incubator-derby</groupId>
<artifactId>derby</artifactId>
<version>${derby_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>incubator-derby</groupId>
<artifactId>derbynet</artifactId>
<version>${derby_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j_version}</version>
<url>http://jakarta.apache.org/log4j</url>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
</properties>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>${mx4j_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
</properties>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
<version>${mx4j_version}</version>
<properties>
<lib>true</lib>
<server>true</server>
<deploy>true</deploy>
<clideployer>true</clideployer>
</properties>
</dependency>
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
<version>${regexp_version}</version>
<properties>
<repository>true</repository>
</properties>
<url>http://jakarta.apache.org/regexp</url>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces_version}</version>
<properties>
<endorsed>true</endorsed>
</properties>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
<version>${xml_parser_apis_version}</version>
<properties>
<endorsed>true</endorsed>
</properties>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean-apache</artifactId>
<version>${xmlbeans_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
<version>${tranql_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-orb</artifactId>
<version>${openorb_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-ins</artifactId>
<version>${openorb_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-pss</artifactId>
<version>${openorb_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-ssl</artifactId>
<version>${openorb_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-orb-omg</artifactId>
<version>${openorb_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-orb-tools</artifactId>
<version>${openorb_version}</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-ots</artifactId>
<version>${openorb_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>openorb</groupId>
<artifactId>openorb-tools</artifactId>
<version>${openorb_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-framework</artifactId>
<version>${avalon_framework_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-logkit</artifactId>
<version>${avalon_logkit_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov</artifactId>
<version>${bouncycastle_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>xfire</groupId>
<artifactId>xfire</artifactId>
<version>${xfire_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>xfire</groupId>
<artifactId>xfire-java</artifactId>
<version>${xfire_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>${wsdl4j_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis-wsdl4j</artifactId>
<version>${axis_wsdl4j_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<version>${stax_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>${stax_api_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-axis</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-axis-builder</artifactId>
<version>${geronimo_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
<version>${axis_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>commons-discovery</artifactId>
<version>${axis_commons_discovery_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
<dependency>
<groupId>ews</groupId>
<artifactId>ews</artifactId>
<version>${ews_version}</version>
<properties>
<repository>true</repository>
</properties>
</dependency>
-->
</dependencies>
</project>
1.1 openejb/m2/ejb-test-ear.pom
Index: ejb-test-ear.pom
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Revision: 1.1 $ $Date: 2005/03/18 05:29:02 $ -->
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>openejb</groupId>
<artifactId>openejb</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>openejb</groupId>
<artifactId>test-ear</artifactId>
<packaging>ear</packaging>
<name>OpenEJB Test Ear</name>
<dependencies>
<dependency>
<groupId>openejb</groupId>
<artifactId>test-ejb-jar</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
</project>
