portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/components/idgenerator project.xml maven.xml project.properties
Date Tue, 11 May 2004 18:21:34 GMT
weaver      2004/05/11 11:21:34

  Modified:    components/idgenerator Tag: NANOCONTAINER_DEPLOYER
                        project.xml maven.xml project.properties
  Log:
  the great component migration
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.3   +150 -139  jakarta-jetspeed-2/components/idgenerator/Attic/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/idgenerator/Attic/project.xml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- project.xml	23 Apr 2004 22:33:27 -0000	1.1.2.2
  +++ project.xml	11 May 2004 18:21:34 -0000	1.1.2.3
  @@ -1,139 +1,150 @@
  -<?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-id-generator</id>
  -  <groupId>jetspeed2</groupId>
  -  <name>Jetspeed-2 ID Generator</name>
  -  <currentVersion>2.0-a1-dev</currentVersion>
  -  <package>org.apache.jetspeed</package>
  -  <description>
  -	  Jetspeed ID Generator
  -  </description>
  -  <shortDescription>ID Generator</shortDescription>
  -
  -  <repository>                 
  -    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/jetspeed</connection>
  -    <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/jetspeed/</url>
  -  </repository>
  -
  -  <dependencies>
  -  	<dependency>
  -      <id>jetspeed2:jetspeed-commons</id>
  -      <version>2.0-a1-dev</version>
  -    </dependency>
  -    <dependency>
  -      <id>jetspeed2:jetspeed-cm</id>
  -      <version>2.0-a1-dev</version>
  -    </dependency>
  -    <dependency>
  -      <id>commons-logging</id>
  -      <version>1.0.3</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>picocontainer</id>
  -      <version>1.0-RC-1-SNAPSHOT</version>
  -    </dependency>
  -    <dependency>
  -      <id>nanocontainer</id>
  -      <version>1.0-beta-1-SNAPSHOT</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>asm</id>
  -      <version>1.4.1</version>
  -    </dependency>
  -    <dependency>
  -      <id>groovy</id>
  -     <version>1.0-beta-4-snapshot</version>
  -    </dependency>
  -    <dependency>
  -      <id>xerces</id>
  -      <version>2.3.0</version>
  -    </dependency>
  -    <dependency>
  -      <id>xml-apis</id>
  -      <version>2.0.2</version>
  -    </dependency>
  -  </dependencies>
  -  <build>
  -    <sourceDirectory>src/java</sourceDirectory>
  -     <resources>
  -      <resource>
  -        <directory>${basedir}/src/java</directory>
  -        <excludes>
  -          <exclude>**/*.java</exclude>
  -        </excludes>
  -      </resource>
  -    </resources>
  -    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
  -    <unitTest>
  -       <includes>
  -        <include>**/Test*.java</include>
  -      </includes>
  -      <excludes>
  -      </excludes>
  -      <resources>
  -        <resource>
  -          <directory>${basedir}/src/test</directory>
  -          <excludes>
  -           <exclude>**/*.java</exclude>
  -          </excludes>
  -        </resource>
  -      </resources>
  -    </unitTest>
  -    
  -  </build>
  -
  -  <reports>
  -    <report>maven-jdepend-plugin</report>
  -<!--
  -    <report>maven-checkstyle-plugin</report>
  --->
  -<!--
  -    <report>maven-pmd-plugin</report>
  -    <report>maven-changelog-plugin</report>
  -    <report>maven-file-activity-plugin</report>
  -    <report>maven-developer-activity-plugin</report>
  -    <report>maven-license-plugin</report>
  -    <report>maven-javadoc-plugin</report>
  -    <report>maven-jxr-plugin</report>
  -    <report>maven-junit-report-plugin</report>
  -    <report>maven-linkcheck-plugin</report>
  -    <report>maven-tasklist-plugin</report>
  --->
  -  </reports>  
  -</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-id-generator</id>
  +  <groupId>jetspeed2</groupId>
  +  <name>Jetspeed-2 ID Generator</name>
  +  <currentVersion>2.0-a1-dev</currentVersion>
  +  <package>org.apache.jetspeed</package>
  +  <description>
  +	  Jetspeed ID Generator
  +  </description>
  +  <shortDescription>ID Generator</shortDescription>
  +
  +  <repository>                 
  +    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-jetspeed-2/components/jetspeed</connection>
  +    <url>http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/jetspeed/</url>
  +  </repository>
  +
  +  <dependencies>
  +  	<dependency>
  +      <id>jetspeed2:jetspeed-commons</id>
  +      <version>2.0-a1-dev</version>
  +    </dependency>
  +    <dependency>
  +      <id>jetspeed2:jetspeed-cm</id>
  +      <version>2.0-a1-dev</version>
  +    </dependency>
  +    <dependency>
  +      <id>commons-logging</id>
  +      <version>1.0.3</version>
  +      <properties>
  +        <jar.bundle>true</jar.bundle>
  +      </properties>
  +    </dependency>
  +    <dependency>
  +      <id>commons-configuration</id>
  +      <version>1.0-dev</version>
  +    </dependency>
  +    <dependency>
  +      <id>junit</id>
  +      <version>3.8.1</version>
  +    </dependency>
  +    <dependency>
  +      <id>log4j</id>
  +      <version>1.2.6</version>
  +      <properties>
  +        <jar.bundle>true</jar.bundle>
  +      </properties>
  +    </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>commons-vfs</id>
  +      <version>SNAPSHOT</version>
  +    </dependency>
  +    <dependency>
  +      <id>nanocontainer:nanocontainer-deployer</id>
  +      <version>1.0-beta-1-SNAPSHOT</version>
  +    </dependency>
  +     <dependency>
  +      <id>asm</id>
  +      <version>1.4.1</version>
  +    </dependency>
  +    <dependency>
  +      <id>groovy</id>
  +     <version>1.0-beta-4-snapshot</version>
  +    </dependency>
  +    <dependency>
  +      <id>xerces</id>
  +      <version>2.3.0</version>
  +    </dependency>
  +    <dependency>
  +      <id>xml-apis</id>
  +      <version>2.0.2</version>
  +    </dependency>
  +  </dependencies>
  +  <build>
  +    <sourceDirectory>src/java</sourceDirectory>
  +     <resources>
  +      <resource>
  +        <directory>${basedir}/src/java</directory>
  +        <excludes>
  +          <exclude>**/*.java</exclude>
  +        </excludes>
  +      </resource>
  +    </resources>
  +    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
  +    <unitTest>
  +       <includes>
  +        <include>**/Test*.java</include>
  +      </includes>
  +      <excludes>
  +      </excludes>
  +      <resources>
  +        <resource>
  +          <directory>${basedir}/src/test</directory>
  +          <excludes>
  +           <exclude>**/*.java</exclude>
  +          </excludes>
  +        </resource>
  +      </resources>
  +    </unitTest>
  +    
  +  </build>
  +
  +  <reports>
  +    <report>maven-jdepend-plugin</report>
  +<!--
  +    <report>maven-checkstyle-plugin</report>
  +-->
  +<!--
  +    <report>maven-pmd-plugin</report>
  +    <report>maven-changelog-plugin</report>
  +    <report>maven-file-activity-plugin</report>
  +    <report>maven-developer-activity-plugin</report>
  +    <report>maven-license-plugin</report>
  +    <report>maven-javadoc-plugin</report>
  +    <report>maven-jxr-plugin</report>
  +    <report>maven-junit-report-plugin</report>
  +    <report>maven-linkcheck-plugin</report>
  +    <report>maven-tasklist-plugin</report>
  +-->
  +  </reports>  
  +</project>
  
  
  
  1.1.2.2   +29 -29    jakarta-jetspeed-2/components/idgenerator/Attic/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/idgenerator/Attic/maven.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- maven.xml	20 Apr 2004 16:26:19 -0000	1.1.2.1
  +++ maven.xml	11 May 2004 18:21:34 -0000	1.1.2.2
  @@ -1,29 +1,29 @@
  -<!--
  -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.idgenerator.TestIdGenerator'/>

  -  
  -   <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>
  +<!--
  +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.idgenerator.TestIdGenerator'/>

  +  
  +   <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>
  
  
  
  1.1.2.2   +43 -43    jakarta-jetspeed-2/components/idgenerator/Attic/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/idgenerator/Attic/project.properties,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- project.properties	20 Apr 2004 16:26:19 -0000	1.1.2.1
  +++ project.properties	11 May 2004 18:21:34 -0000	1.1.2.2
  @@ -1,43 +1,43 @@
  -# 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.
  -
  -# Remote repos
  -maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/,http://dist.codehaus.org
  -
  -# Display the date on the Maven web site
  -maven.xdoc.date = left
  -
  -# Display the maven version the web site is documenting
  -maven.xdoc.version = ${pom.currentVersion}
  -
  -maven.checkstyle.header.file=${basedir}/../../checkstyle.license
  -maven.checkstyle.properties=${basedir}/../../checkstyle.xml
  -
  -maven.license.licenseFile=${basedir}/../../LICENSE.TXT
  -
  -maven.compile.deprecation=on
  -
  -# Include private method and field in Javadoc.
  -maven.javadoc.private=true
  -
  -# Removed the rule ${plugin.resources}/rulesets/naming.xml from the default
  -# maven.pmd.rulesetfiles.  This is because the LongVariableName rule is to
  -# restrictive.  We need to increase the limit from 12 to 20
  -maven.pmd.rulesetfiles=${plugin.resources}/rulesets/strings.xml,${plugin.resources}/rulesets/junit.xml,${plugin.resources}/rulesets/braces.xml,${plugin.resources}/rulesets/basic.xml,${plugin.resources}/rulesets/unusedcode.xml,${plugin.resources}/rulesets/design.xml,${plugin.resources}/rulesets/imports.xml,${plugin.resources}/rulesets/codesize.xml
  -
  -# Include private method and field in Javadoc.
  -maven.multiproject.type=jar
  -
  -maven.junit.fork=true
  -
  +# 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.
  +
  +# Remote repos
  +maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/,http://dist.codehaus.org
  +
  +# Display the date on the Maven web site
  +maven.xdoc.date = left
  +
  +# Display the maven version the web site is documenting
  +maven.xdoc.version = ${pom.currentVersion}
  +
  +maven.checkstyle.header.file=${basedir}/../../checkstyle.license
  +maven.checkstyle.properties=${basedir}/../../checkstyle.xml
  +
  +maven.license.licenseFile=${basedir}/../../LICENSE.TXT
  +
  +maven.compile.deprecation=on
  +
  +# Include private method and field in Javadoc.
  +maven.javadoc.private=true
  +
  +# Removed the rule ${plugin.resources}/rulesets/naming.xml from the default
  +# maven.pmd.rulesetfiles.  This is because the LongVariableName rule is to
  +# restrictive.  We need to increase the limit from 12 to 20
  +maven.pmd.rulesetfiles=${plugin.resources}/rulesets/strings.xml,${plugin.resources}/rulesets/junit.xml,${plugin.resources}/rulesets/braces.xml,${plugin.resources}/rulesets/basic.xml,${plugin.resources}/rulesets/unusedcode.xml,${plugin.resources}/rulesets/design.xml,${plugin.resources}/rulesets/imports.xml,${plugin.resources}/rulesets/codesize.xml
  +
  +# Include private method and field in Javadoc.
  +maven.multiproject.type=jar
  +
  +maven.junit.fork=true
  +
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message