You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/04/21 19:03:43 UTC
svn commit: r164088 - in /geronimo/trunk: ./ applications/ modules/ plugins/
plugins/geronimo-assembly-plugin/ plugins/geronimo-packaging-plugin/
plugins/maven-geronimo-plugin/ plugins/maven-xpom-plugin/ specs/
Author: djencks
Date: Thu Apr 21 10:03:42 2005
New Revision: 164088
URL: http://svn.apache.org/viewcvs?rev=164088&view=rev
Log:
new build system
Added:
geronimo/trunk/applications/project.properties
geronimo/trunk/buildall.sh (with props)
geronimo/trunk/modules/project.properties
geronimo/trunk/plugins/project.properties
geronimo/trunk/specs/project.properties
Modified:
geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties
geronimo/trunk/plugins/geronimo-packaging-plugin/project.properties
geronimo/trunk/plugins/maven-geronimo-plugin/project.properties
geronimo/trunk/plugins/maven-xpom-plugin/project.properties
Added: geronimo/trunk/applications/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/project.properties?rev=164088&view=auto
==============================================================================
--- geronimo/trunk/applications/project.properties (added)
+++ geronimo/trunk/applications/project.properties Thu Apr 21 10:03:42 2005
@@ -0,0 +1,33 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+##
+## $Rev: 158645 $ $Date: 2005-03-22 11:39:44 -0800 (Tue, 22 Mar 2005) $
+##
+
+
+#multiproject properties
+maven.multiproject.includes=\
+*/project.xml
+
+maven.multiproject.excludes=\
+
+maven.idea.project.multiproject.includes=${maven.multiproject.includes}
+maven.idea.project.multiproject.excludes=${maven.multiproject.excludes}
+
+maven.username=${user.name}
+maven.repo.central=apache.org
+maven.repo.central.directory=/www/cvs.apache.org/repository
+
+
Added: geronimo/trunk/buildall.sh
URL: http://svn.apache.org/viewcvs/geronimo/trunk/buildall.sh?rev=164088&view=auto
==============================================================================
--- geronimo/trunk/buildall.sh (added)
+++ geronimo/trunk/buildall.sh Thu Apr 21 10:03:42 2005
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+#script to build geronimo, tranql, tranql-connector, and openejb in a reasonable order
+
+echo "To deploy use the command line ./buildall.sh [clean] deploy <your apache/codehaus username>"
+
+set -e
+
+MAVEN_REPO=~/.maven/repository
+
+OFFLINE=
+
+TRANQL=tranql/tranql
+TRANQLCONNECTOR=tranql/connector
+OPENEJB=openejb
+
+if [ "$1" = clean ]; then
+ shift
+ echo cleaning...
+ (cd specs;maven $OFFLINE multiproject:clean)
+ (if [ -d $TRANQL ]; then cd $TRANQL ; maven $OFFLINE clean; fi)
+ (if [ -d $TRANQLCONNECTOR ]; then cd $TRANQLCONNECTOR; maven $OFFLINE clean; fi)
+ (cd modules; maven $OFFLINE multiproject:clean)
+ (cd plugins; maven $OFFLINE multiproject:clean)
+ (cd applications; maven $OFFLINE multiproject:clean)
+ (if [ -d $OPENEJB ]; then cd $OPENEJB/modules; maven $OFFLINE multiproject:clean; fi)
+ (cd modules/assembly; maven $OFFLINE clean)
+ (if [ -d $OPENEJB ]; then cd openejb/modules/assembly; maven $OFFLINE clean; fi)
+ (if [ -d $OPENEJB ]; then cd openejb/modules/itests; maven $OFFLINE clean; fi )
+fi
+
+echo updating
+svn up
+(if [ -d $TRANQL ]; then cd $TRANQL ; cvs -q up -dP; fi)
+(if [ -d $TRANQLCONNECTOR ]; then cd $TRANQLCONNECTOR; cvs -q up -dP; fi)
+(if [ -d $OPENEJB ]; then cd $OPENEJB; cvs -q up -dP; fi)
+
+echo cleaning local repo
+rm -rf $MAVEN_REPO/geronimo
+rm -rf $MAVEN_REPO/geronimo-spec
+if [ -d $TRANQL ]; then rm -rf $MAVEN_REPO/tranql; fi
+if [ -d $OPENEJB ]; then rm -rf $MAVEN_REPO/openejb; fi
+
+OFFLINE=-o
+
+echo building
+(cd specs;maven $OFFLINE multiproject:install)
+(if [ -d $TRANQL ]; then cd $TRANQL ; maven $OFFLINE jar:install; fi)
+(if [ -d $TRANQLCONNECTOR ]; then cd $TRANQLCONNECTOR; maven $OFFLINE rar:install; fi)
+(cd plugins/maven-xmlbeans-plugin; maven -o plugin:install);
+(cd modules; maven $OFFLINE multiproject:install)
+(cd plugins; maven $OFFLINE multiproject:install)
+(cd applications; maven $OFFLINE multiproject:install)
+(if [ -d $OPENEJB ]; then cd $OPENEJB/modules; maven $OFFLINE multiproject:install; fi)
+(cd modules/assembly; maven $OFFLINE jar:install)
+(if [ -d $OPENEJB ]; then cd openejb/modules/assembly; maven $OFFLINE jar:install; fi)
+#(if [ -d $OPENEJB ]; then cd openejb/modules/itests; maven $OFFLINE; fi )
+
+if [ "$1" = deploy ]; then
+ echo deploying
+ (cd specs;maven -o -Duser.name=$2 multiproject:deploy)
+ (if [ -d $TRANQL ]; then cd $TRANQL ; maven -o -Duser.name=$2 jar:deploy; fi)
+ (if [ -d $TRANQLCONNECTOR ]; then cd $TRANQLCONNECTOR; maven -o -Duser.name=$2 jar:deploy rar:deploy; fi)
+ (cd modules; maven -o -Duser.name=$2 multiproject:deploy)
+ (if [ -d $OPENEJB ]; then cd $OPENEJB/modules; maven -o -Duser.name=$2 multiproject:deploy; fi)
+ (cd modules/assembly; maven -o -Duser.name=$2 jar:deploy)
+ (if [ -d $OPENEJB ]; then cd openejb/modules/assembly; maven -o -Duser.name=$2 jar:deploy; fi)
+fi
Propchange: geronimo/trunk/buildall.sh
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/trunk/modules/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/project.properties?rev=164088&view=auto
==============================================================================
--- geronimo/trunk/modules/project.properties (added)
+++ geronimo/trunk/modules/project.properties Thu Apr 21 10:03:42 2005
@@ -0,0 +1,34 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+##
+## $Rev: 158645 $ $Date: 2005-03-22 11:39:44 -0800 (Tue, 22 Mar 2005) $
+##
+
+
+#multiproject properties
+maven.multiproject.includes=\
+*/project.xml
+
+maven.multiproject.excludes=\
+assembly/project.xml
+
+maven.idea.project.multiproject.includes=${maven.multiproject.includes}
+maven.idea.project.multiproject.excludes=${maven.multiproject.excludes}
+
+maven.username=${user.name}
+maven.repo.central=apache.org
+maven.repo.central.directory=/www/cvs.apache.org/repository
+
+
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties?rev=164088&r1=164087&r2=164088&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.properties Thu Apr 21 10:03:42 2005
@@ -22,4 +22,7 @@
maven.compile.source=1.4
maven.compile.target=1.4
-geronimoVersion=1.0-SNAPSHOT
\ No newline at end of file
+geronimoVersion=1.0-SNAPSHOT
+
+maven.multiproject.type=plugin
+
Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/project.properties?rev=164088&r1=164087&r2=164088&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/project.properties (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/project.properties Thu Apr 21 10:03:42 2005
@@ -1,27 +1,29 @@
-##
-##
-## Copyright 2005 The Apache Software Foundation
-##
-## Licensed under the Apache License, Version 2.0 (the "License");
-## you may not use this file except in compliance with the License.
-## You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-##
-## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
-##
-
-maven.compile.source=1.4
-maven.compile.target=1.4
-
-# use personal repo at Apache until we are prepared to release this
-maven.repo.remote=http://people.apache.org/~jboynes, http://www.ibiblio.org/maven
-
+##
+##
+## Copyright 2005 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+##
+## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
+##
+
+maven.compile.source=1.4
+maven.compile.target=1.4
+
+# use personal repo at Apache until we are prepared to release this
+maven.repo.remote=http://people.apache.org/~jboynes, http://www.ibiblio.org/maven
+
+maven.multiproject.type=plugin
+
Modified: geronimo/trunk/plugins/maven-geronimo-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-geronimo-plugin/project.properties?rev=164088&r1=164087&r2=164088&view=diff
==============================================================================
--- geronimo/trunk/plugins/maven-geronimo-plugin/project.properties (original)
+++ geronimo/trunk/plugins/maven-geronimo-plugin/project.properties Thu Apr 21 10:03:42 2005
@@ -1,28 +1,30 @@
-##
-##
-## Copyright 2003-2004 The Apache Software Foundation
-##
-## Licensed under the Apache License, Version 2.0 (the "License");
-## you may not use this file except in compliance with the License.
-## You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-
-##
-## $Rev: 45927 $ $Date: 2004-09-11 16:29:34 -0700 (Sat, 11 Sep 2004) $
-##
-
-maven.compile.source=1.4
-maven.compile.target=1.4
-maven.compile.deprecation=true
-maven.compile.debug=true
-maven.compile.optimize=true
-
-maven.junit.jvmargs=-ea
+##
+##
+## Copyright 2003-2004 The Apache Software Foundation
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+##
+## $Rev: 45927 $ $Date: 2004-09-11 16:29:34 -0700 (Sat, 11 Sep 2004) $
+##
+
+maven.compile.source=1.4
+maven.compile.target=1.4
+maven.compile.deprecation=true
+maven.compile.debug=true
+maven.compile.optimize=true
+
+maven.junit.jvmargs=-ea
+
+maven.multiproject.type=plugin
Modified: geronimo/trunk/plugins/maven-xpom-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-xpom-plugin/project.properties?rev=164088&r1=164087&r2=164088&view=diff
==============================================================================
--- geronimo/trunk/plugins/maven-xpom-plugin/project.properties (original)
+++ geronimo/trunk/plugins/maven-xpom-plugin/project.properties Thu Apr 21 10:03:42 2005
@@ -7,3 +7,6 @@
maven.compile.deprecation=true
maven.compile.debug=true
maven.compile.optimize=true
+
+maven.multiproject.type=plugin
+
Added: geronimo/trunk/plugins/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/project.properties?rev=164088&view=auto
==============================================================================
--- geronimo/trunk/plugins/project.properties (added)
+++ geronimo/trunk/plugins/project.properties Thu Apr 21 10:03:42 2005
@@ -0,0 +1,35 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+##
+## $Rev: 158645 $ $Date: 2005-03-22 11:39:44 -0800 (Tue, 22 Mar 2005) $
+##
+
+
+#multiproject properties
+maven.multiproject.includes=\
+*/project.xml
+
+maven.multiproject.excludes=\
+maven-xmlbeans-plugin/project.xml,\
+geronimo-packaging-plugin/project.xml
+
+maven.idea.project.multiproject.includes=${maven.multiproject.includes}
+maven.idea.project.multiproject.excludes=${maven.multiproject.excludes}
+
+maven.username=${user.name}
+maven.repo.central=apache.org
+maven.repo.central.directory=/www/cvs.apache.org/repository
+
+
Added: geronimo/trunk/specs/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/specs/project.properties?rev=164088&view=auto
==============================================================================
--- geronimo/trunk/specs/project.properties (added)
+++ geronimo/trunk/specs/project.properties Thu Apr 21 10:03:42 2005
@@ -0,0 +1,33 @@
+# Copyright 2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+##
+## $Rev: 158645 $ $Date: 2005-03-22 11:39:44 -0800 (Tue, 22 Mar 2005) $
+##
+
+
+#multiproject properties
+maven.multiproject.includes=\
+*/project.xml
+
+maven.multiproject.excludes=\
+
+maven.idea.project.multiproject.includes=${maven.multiproject.includes}
+maven.idea.project.multiproject.excludes=${maven.multiproject.excludes}
+
+maven.username=${user.name}
+maven.repo.central=apache.org
+maven.repo.central.directory=/www/cvs.apache.org/repository
+
+