You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2004/05/11 20:50:30 UTC
cvs commit: jakarta-jetspeed-2/components/security maven.xml .cvsignore project.xml
weaver 2004/05/11 11:50:30
Modified: components/security Tag: NANOCONTAINER_DEPLOYER maven.xml
.cvsignore project.xml
Log:
maven descriptor changes
Revision Changes Path
No revision
No revision
1.2.2.1 +42 -49 jakarta-jetspeed-2/components/security/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/maven.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- maven.xml 18 Mar 2004 14:38:59 -0000 1.2
+++ maven.xml 11 May 2004 18:50:30 -0000 1.2.2.1
@@ -1,49 +1,42 @@
-<!--
-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.security.TestLoginModule'/>
-
- <goal name="deployJar">
- <attainGoal name="jar:install"/>
-
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
- </goal>
-
- <!-- ================================================================ -->
- <!-- Merge OJB desriptor with Jetspeed main OJB descriptor -->
- <!-- ================================================================ -->
- <goal name="ojb.registry">
- <copy file="${basedir}/src/java/repository_security.xml" tofile="${basedir}/../../portal/target/classes/repository_security.xml"/>
- <copy file="${basedir}/src/java/repository_security.xml" tofile="${basedir}/../../portal/target/test-classes/repository_security.xml"/>
- </goal>
-
- <goal name="deployJar">
- <attainGoal name="jar:install"/>
-
- <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
- </goal>
-
- <goal name="build.security">
- <attainGoal name="ojb.registry"/>
- <attainGoal name="jar:install"/>
-</goal>
-
-</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.security.TestLoginModule'/>
+
+ <goal name="deployJar">
+ <attainGoal name="jar:install"/>
+
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ </goal>
+
+
+ <goal name="deployJar">
+ <attainGoal name="jar:install"/>
+
+ <copy file="${basedir}/target/${maven.final.name}.jar" todir="${deploy.war.dir}/jetspeed/WEB-INF/lib"/>
+ </goal>
+
+ <goal name="build.security">
+
+ <attainGoal name="jar:install"/>
+</goal>
+
+</project>
1.1.2.1 +2 -1 jakarta-jetspeed-2/components/security/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- .cvsignore 10 Mar 2004 06:13:02 -0000 1.1
+++ .cvsignore 11 May 2004 18:50:30 -0000 1.1.2.1
@@ -1,2 +1,3 @@
target
-maven.log
\ No newline at end of file
+maven.log
+junit*.properties
1.5.2.4 +226 -234 jakarta-jetspeed-2/components/security/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/project.xml,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- project.xml 26 Apr 2004 11:46:19 -0000 1.5.2.3
+++ project.xml 11 May 2004 18:50:30 -0000 1.5.2.4
@@ -1,234 +1,226 @@
-<?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-security</id>
- <groupId>jetspeed2</groupId>
- <name>Jetspeed-2 Security Components</name>
- <currentVersion>2.0-a1-dev</currentVersion>
- <package>org.apache.jetspeed</package>
- <description>
- Security Components
- </description>
- <shortDescription>Security Components</shortDescription>
-
- <repository>
- <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/security</connection>
- <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/</url>
- </repository>
-
- <dependencies>
- <!-- AspectJ -->
- <dependency>
- <id>aspectj:aspectjrt</id>
- <version>1.0.6</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
- <id>aspectj:aspectj-ant</id>
- <version>1.0.6</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
- <id>aspectj:aspectj-tools</id>
- <version>1.0.6</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
-
- <!-- Components -->
- <dependency>
- <id>jetspeed2:jetspeed-cm</id>
- <version>2.0-a1-dev</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>jetspeed2:jetspeed-persistence</id>
- <version>2.0-a1-dev</version>
- <properties>
- <component.only>true</component.only>
- </properties>
- </dependency>
- <dependency>
- <id>jetspeed2:jetspeed-prefs</id>
- <version>2.0-a1-dev</version>
- <properties>
- <component.only>true</component.only>
- </properties>
- </dependency>
-
- <!-- Testing only -->
- <dependency>
- <id>jetspeed2:jetspeed-rdbms</id>
- <version>2.0-a1-dev</version>
- <properties>
- <component.only>false</component.only>
- </properties>
- </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-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.rc5-PATCHED</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
-
- <dependency>
- <id>ojb</id>
- <version>1.0.rc4</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>-->
- <dependency>
- <id>xerces</id>
- <version>2.3.0</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <dependency>
- <id>xml-apis</id>
- <version>2.0.2</version>
- <properties>
- <war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
- <!-- This is only a test dependency -->
- <dependency>
- <id>jetspeed2:jetspeed-commons</id>
- <version>2.0-a1-dev</version>
- </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>commons-vfs</id>
- <version>SNAPSHOT</version>
- </dependency>
- <dependency>
- <id>nanocontainer:nanocontainer-deployer</id>
- <version>1.0-beta-1-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
-
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
- <aspectSourceDirectory>src/aop</aspectSourceDirectory>
- <unitTest>
- <includes>
- <include>**/Test*.java</include>
- </includes>
-
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${basedir}/src/java</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-security</id>
+ <groupId>jetspeed2</groupId>
+ <name>Jetspeed-2 Security Components</name>
+ <currentVersion>2.0-a1-dev</currentVersion>
+ <package>org.apache.jetspeed</package>
+ <description>
+ Security Components
+ </description>
+ <shortDescription>Security Components</shortDescription>
+
+ <repository>
+ <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/security</connection>
+ <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/security/</url>
+ </repository>
+
+ <dependencies>
+ <!-- AspectJ -->
+ <dependency>
+ <id>aspectj:aspectjrt</id>
+ <version>1.0.6</version>
+ <properties>
+ <classloader>root</classloader>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>aspectj:aspectj-ant</id>
+ <version>1.0.6</version>
+ <properties>
+ <classloader>root</classloader>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>aspectj:aspectj-tools</id>
+ <version>1.0.6</version>
+ <properties>
+ <classloader>root</classloader>
+ </properties>
+ </dependency>
+
+ <!-- Components -->
+ <dependency>
+ <id>jetspeed2:jetspeed-cm</id>
+ <version>2.0-a1-dev</version>
+ </dependency>
+ <dependency>
+ <id>jetspeed2:jetspeed-persistence</id>
+ <version>2.0-a1-dev</version>
+ </dependency>
+ <dependency>
+ <id>jetspeed2:jetspeed-prefs</id>
+ <version>2.0-a1-dev</version>
+ </dependency>
+
+ <!-- Testing only -->
+ <dependency>
+ <id>jetspeed2:jetspeed-rdbms</id>
+ <version>2.0-a1-dev</version>
+ </dependency>
+ <dependency>
+ <id>commons-lang</id>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <id>commons-beanutils</id>
+ <version>1.6.1</version>
+ </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>
+ </dependency>
+ <dependency>
+ <id>commons-io</id>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <id>ojb:db-ojb</id>
+ <version>1.0.rc6</version>
+ </dependency>
+ <!--
+ <dependency>
+ <id>ojb:db-ojb</id>
+ <version>1.0.rc5-PATCHED</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <id>ojb</id>
+ <version>1.0.rc4</version>
+ <properties>
+ <war.bundle.jar>true</war.bundle.jar>
+ </properties>
+ </dependency>-->
+ <dependency>
+ <id>xerces</id>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <id>xml-apis</id>
+ <version>2.0.2</version>
+ </dependency>
+ <!-- This is only a test dependency -->
+ <dependency>
+ <id>jetspeed2:jetspeed-commons</id>
+ <version>2.0-a1-dev</version>
+ </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>commons-vfs</id>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <id>nanocontainer:nanocontainer-deployer</id>
+ <version>1.0-beta-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <id>jta</id>
+ <jar>jta1.0.1.jar</jar>
+ </dependency>
+ <dependency>
+ <id>tyrex</id>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <id>commons-configuration</id>
+ <version>1.0-dev</version>
+ </dependency>
+ <dependency>
+ <id>commons-pool</id>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <id>commons-dbcp</id>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+
+ <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ <aspectSourceDirectory>src/aop</aspectSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>**/component.pkg</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </unitTest>
+
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ </build>
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org