weaver 2004/05/11 11:48:23
Modified: components/persistence Tag: NANOCONTAINER_DEPLOYER
project.xml maven.xml
Log:
maven descriptor changes
Revision Changes Path
No revision
No revision
1.8.2.4 +247 -236 jakarta-jetspeed-2/components/persistence/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/project.xml,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- project.xml 26 Apr 2004 11:46:18 -0000 1.8.2.3
+++ project.xml 11 May 2004 18:48:23 -0000 1.8.2.4
@@ -1,236 +1,247 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<project>
-<extend>${basedir}/../../project.xml</extend>
- <pomVersion>3</pomVersion>
- <id>jetspeed-persistence</id>
- <groupId>jetspeed2</groupId>
- <name>Jetspeed-2 Persistence Components</name>
- <currentVersion>2.0-a1-dev</currentVersion>
- <package>org.apache.jetspeed</package>
- <description>
- Persistence Components
- </description>
- <shortDescription>Persistence Components</shortDescription>
- <repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-jetspeed-2/components/persistence</connection>
-
<url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/persistence/</url>
- </repository>
-
- <dependencies>
- <dependency>
- <id>jetspeed-cm</id>
- <groupId>jetspeed2</groupId>
- <version>2.0-a1-dev</version>
- </dependency>
- <dependency>
- <id>jetspeed-commons</id>
- <groupId>jetspeed2</groupId>
- <version>2.0-a1-dev</version>
- </dependency>
- <!-- testing only -->
- <dependency>
- <id>jetspeed-rdbms</id>
- <groupId>jetspeed2</groupId>
- <version>2.0-a1-dev</version>
- </dependency>
- <dependency>
- <id>commons-lang</id>
- <version>2.0</version>
- <properties>
- <jar.bundle>true</jar.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>commons-logging</id>
- <version>1.0.3</version>
- <properties>
- <jar.bundle>true</jar.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>commons-vfs</id>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <id>nanocontainer:nanocontainer-deployer</id>
- <version>1.0-beta-1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <id>commons-beanutils</id>
- <version>1.6.1</version>
- <properties>
- <jar.bundle>true</jar.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>junit</id>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <id>log4j</id>
- <version>1.2.6</version>
- </dependency>
- <dependency>
- <id>commons-collections</id>
- <version>3.0</version>
- <properties>
- <jar.bundle>true</jar.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>commons-io</id>
- <version>0.1</version>
- <properties>
- <jar.bundle>true</jar.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>ojb:db-ojb</id>
- <version>1.0.rc6</version>
- <properties>
- <jar.bundle>true</jar.bundle>
- </properties>
- </dependency>
- <!--
- <dependency>
- <id>ojb</id>
- <version>1.0.rc4</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>-->
- <dependency>
- <id>commons-pool</id>
- <version>1.1</version>
- <properties>
- <jar.bundle>true</jar.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>commons-dbcp</id>
- <version>1.1</version>
- <properties>
- <jar.bundle>true</jar.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>jdbc-se</id>
- <jar>jdbc-se2.0.jar</jar>
- <properties>
- <jar.bundle>false</jar.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>xerces</id>
- <version>2.3.0</version>
- <properties>
- <jar.bundle>true</jar.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>xml-apis</id>
- <version>2.0.2</version>
- <properties>
- <jar.bundle>true</jar.bundle>
- </properties>
- </dependency>
- <!--
- <dependency>
- <id>jdom</id>
- <version>b8</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- -->
- <!-- This is only a test dependency -->
- <dependency>
- <id>hsqldb</id>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <id>picocontainer</id>
- <version>1.0-RC-1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <id>nanocontainer</id>
- <version>1.0-beta-1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <id>groovy</id>
- <version>1.0-beta-4-snapshot</version>
- </dependency>
- <dependency>
- <id>asm</id>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <id>jta</id>
- <jar>jta1.0.1.jar</jar>
- <properties>
- <jar.bundle>true</jar.bundle>
- </properties>
- </dependency>
- <dependency>
- <id>portlet-api</id>
- <version>1.0</version>
- </dependency>
- <!-- Testing only -->
- <dependency>
- <id>tyrex</id>
- <version>1.0.1</version>
- </dependency>
- </dependencies>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <sourceModifications >
-
- <sourceModification >
- <className>foo.bar</className>
- <excludes>
- <exclude>**/otm/*.java</exclude>
- </excludes>
- </sourceModification>
- </sourceModifications>
-
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </unitTest>
-
- <resources>
- <resource>
- <directory>${basedir}/src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
-
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<project>
+<extend>${basedir}/../../project.xml</extend>
+ <pomVersion>3</pomVersion>
+ <id>jetspeed-persistence</id>
+ <groupId>jetspeed2</groupId>
+ <name>Jetspeed-2 Persistence Components</name>
+ <currentVersion>2.0-a1-dev</currentVersion>
+ <package>org.apache.jetspeed</package>
+ <description>
+ Persistence Components
+ </description>
+ <shortDescription>Persistence Components</shortDescription>
+ <repository>
+ <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-jetspeed-2/components/persistence</connection>
+
<url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/persistence/</url>
+ </repository>
+
+ <dependencies>
+ <dependency>
+ <id>jetspeed-cm</id>
+ <groupId>jetspeed2</groupId>
+ <version>2.0-a1-dev</version>
+ </dependency>
+ <dependency>
+ <id>jetspeed-commons</id>
+ <groupId>jetspeed2</groupId>
+ <version>2.0-a1-dev</version>
+ </dependency>
+ <!-- testing only -->
+ <dependency>
+ <id>jetspeed-rdbms</id>
+ <groupId>jetspeed2</groupId>
+ <version>2.0-a1-dev</version>
+ </dependency>
+ <dependency>
+ <id>commons-lang</id>
+ <version>2.0</version>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-vfs</id>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <id>nanocontainer:nanocontainer-deployer</id>
+ <version>1.0-beta-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <id>commons-beanutils</id>
+ <version>1.6.1</version>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>junit</id>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <id>log4j</id>
+ <version>1.2.6</version>
+ </dependency>
+ <dependency>
+ <id>commons-collections</id>
+ <version>3.0</version>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-io</id>
+ <version>0.1</version>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>ojb:db-ojb</id>
+ <version>1.0.rc6</version>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ <!--
+ <dependency>
+ <id>ojb</id>
+ <version>1.0.rc4</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>-->
+ <dependency>
+ <id>commons-pool</id>
+ <version>1.1</version>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-dbcp</id>
+ <version>1.1</version>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>jdbc-se</id>
+ <jar>jdbc-se2.0.jar</jar>
+ <properties>
+ <jar.bundle>false</jar.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>xerces</id>
+ <version>2.3.0</version>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>xml-apis</id>
+ <version>2.0.2</version>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ <!--
+ <dependency>
+ <id>jdom</id>
+ <version>b8</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+ -->
+ <!-- This is only a test dependency -->
+ <dependency>
+ <id>hsqldb</id>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <id>commons-configuration</id>
+ <version>1.0-dev</version>
+ </dependency>
+ <dependency>
+ <id>classworlds</id>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <id>picocontainer</id>
+ <version>1.0-RC-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <id>nanocontainer</id>
+ <version>1.0-beta-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <id>groovy</id>
+ <version>1.0-beta-4-snapshot</version>
+ </dependency>
+ <dependency>
+ <id>asm</id>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <id>jta</id>
+ <jar>jta1.0.1.jar</jar>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>portlet-api</id>
+ <version>1.0</version>
+ </dependency>
+ <!-- Testing only -->
+ <dependency>
+ <id>tyrex</id>
+ <version>1.0.1</version>
+ <properties>
+ <jar.bundle>true</jar.bundle>
+ </properties>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <sourceModifications >
+
+ <sourceModification >
+ <className>foo.bar</className>
+ <excludes>
+ <exclude>**/otm/*.java</exclude>
+ </excludes>
+ </sourceModification>
+ </sourceModifications>
+
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ </build>
+</project>
1.3.2.3 +32 -35 jakarta-jetspeed-2/components/persistence/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/maven.xml,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- maven.xml 22 Apr 2004 21:09:53 -0000 1.3.2.2
+++ maven.xml 11 May 2004 18:48:23 -0000 1.3.2.3
@@ -1,35 +1,32 @@
-<!--
-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.
--->
-<project default="java:jar"
- xmlns:j="jelly:core"
- xmlns:define="jelly:define"
- xmlns:reactor="reactor">
-
- <!-- Target of maven test:single test -->
- <property name='testcase'
value='org.apache.jetspeed.components.TestComponentManager'/>
-
-
- <goal name="deployJar">
- <attainGoal name="jar:install"/>
-
- <copy file="${basedir}/target/${maven.final.name}.jar"
todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
- </goal>
-
- <preGoal name="test:test">
- <copy todir="${basedir}/target/deploy"
file="${maven.repo.local}/jetspeed2/jars/jetspeed-rdbms-2.0-a1-dev.jar"
overwrite="true" />
- </preGoal>
-
-</project>
+<!--
+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.
+-->
+<project default="java:jar"
+ xmlns:j="jelly:core"
+ xmlns:define="jelly:define"
+ xmlns:reactor="reactor">
+
+ <!-- Target of maven test:single test -->
+ <property name='testcase'
value='org.apache.jetspeed.components.TestComponentManager'/>
+
+
+ <goal name="deployJar">
+ <attainGoal name="jar:install"/>
+
+ <copy file="${basedir}/target/${maven.final.name}.jar"
todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ </goal>
+
+
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
