You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@composer.apache.org by ha...@apache.org on 2008/02/04 06:40:47 UTC

svn commit: r618176 - in /incubator/composer/trunk: apache-composer.iml apache-composer.ipr composer-core/apache-composer-core.iml composer-site/apache-composer-site.iml composer-site/pom.xml composer-tck/apache-composer-tck.iml

Author: hammant
Date: Sun Feb  3 22:40:46 2008
New Revision: 618176

URL: http://svn.apache.org/viewvc?rev=618176&view=rev
Log:
pom changes

Added:
    incubator/composer/trunk/composer-site/apache-composer-site.iml
Modified:
    incubator/composer/trunk/apache-composer.iml
    incubator/composer/trunk/apache-composer.ipr
    incubator/composer/trunk/composer-core/apache-composer-core.iml
    incubator/composer/trunk/composer-site/pom.xml
    incubator/composer/trunk/composer-tck/apache-composer-tck.iml

Modified: incubator/composer/trunk/apache-composer.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/apache-composer.iml?rev=618176&r1=618175&r2=618176&view=diff
==============================================================================
--- incubator/composer/trunk/apache-composer.iml (original)
+++ incubator/composer/trunk/apache-composer.iml Sun Feb  3 22:40:46 2008
@@ -11,54 +11,54 @@
     <orderEntry type="inheritedJdk"/>  
     <orderEntry type="sourceFolder" forTests="false"/>  
     <orderEntryProperties/>  
-    <orderEntry type="module-library">
-      <library>
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/jmock/jmock-junit4/2.4.0/jmock-junit4-2.4.0.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/jmock/jmock/2.4.0/jmock-2.4.0.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/junit/junit-dep/4.4/junit-dep-4.4.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
+      </library> 
+    </orderEntry> 
   </component> 
 </module>

Modified: incubator/composer/trunk/apache-composer.ipr
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/apache-composer.ipr?rev=618176&r1=618175&r2=618176&view=diff
==============================================================================
--- incubator/composer/trunk/apache-composer.ipr (original)
+++ incubator/composer/trunk/apache-composer.ipr Sun Feb  3 22:40:46 2008
@@ -652,7 +652,7 @@
       <module filepath="$PROJECT_DIR$/apache-composer.iml"/>
       <module filepath="$PROJECT_DIR$/composer-core/apache-composer-core.iml"/>
       <module filepath="$PROJECT_DIR$/composer-tck/apache-composer-tck.iml"/>
-      <module filepath="$PROJECT_DIR$/composer-site/picocontainer-distribution.iml"/>
+      <module filepath="$PROJECT_DIR$/composer-site/apache-composer-site.iml"/>
     </modules> 
   </component>  
   <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK"> 
@@ -677,5 +677,5 @@
     <mapping directory="$PROJECT_DIR$" vcs="svn"/> 
   </component>  
   <component name="WebServicesPlugin" addRequiredLibraries="true"/>  
-  <UsedPathMacros></UsedPathMacros> 
+  <UsedPathMacros/> 
 </project>

Modified: incubator/composer/trunk/composer-core/apache-composer-core.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-core/apache-composer-core.iml?rev=618176&r1=618175&r2=618176&view=diff
==============================================================================
--- incubator/composer/trunk/composer-core/apache-composer-core.iml (original)
+++ incubator/composer/trunk/composer-core/apache-composer-core.iml Sun Feb  3 22:40:46 2008
@@ -15,111 +15,111 @@
     <orderEntry type="inheritedJdk"/>  
     <orderEntry type="sourceFolder" forTests="false"/>  
     <orderEntryProperties/>  
-    <orderEntry type="module-library">
-      <library>
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/log4j/log4j/1.2.8/log4j-1.2.8.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/jmock/jmock-junit4/2.4.0/jmock-junit4-2.4.0.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/jmock/jmock/2.4.0/jmock-2.4.0.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/junit/junit-dep/4.4/junit-dep-4.4.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/proxytoys/proxytoys/0.2.1/proxytoys-0.2.1.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/prefuse/prefuse/2006.07.15/prefuse-2006.07.15.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/com/thoughtworks/paranamer/paranamer/1.1/paranamer-1.1.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/asm/asm/3.0/asm-3.0.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
+      </library> 
+    </orderEntry> 
   </component>  
   <component name="copyright"> 
     <Base> 

Added: incubator/composer/trunk/composer-site/apache-composer-site.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/apache-composer-site.iml?rev=618176&view=auto
==============================================================================
--- incubator/composer/trunk/composer-site/apache-composer-site.iml (added)
+++ incubator/composer/trunk/composer-site/apache-composer-site.iml Sun Feb  3 22:40:46 2008
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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.
+-->
+<module version="4" relativePaths="false" type="JAVA_MODULE"> 
+  <component name="NewModuleRootManager"> 
+    <exclude-output/>  
+    <orderEntry type="inheritedJdk"/>  
+    <!-- output url="file://$$MODULE_DIR$$/${maven.build.dest}"/ -->  
+    <!-- output-test url="file://$$MODULE_DIR$$/${maven.test.dest}"/ -->  
+    <content url="file://$MODULE_DIR$"> 
+      <!-- sourceFolder url="file://$$MODULE_DIR$$/${pom.build.sourceDirectory}" isTestSource="false"/ -->  
+      <!-- sourceFolder url="file://$$MODULE_DIR$$/${pom.build.testSourceDirectory}" isTestSource="true"/ -->  
+      <excludeFolder url="file://$MODULE_DIR$/target"/>
+    </content>  
+    <orderEntry type="sourceFolder" forTests="false"/>  
+    <!-- Next include each dependency:
+      <orderEntry type="module" module-name="${dep.artifactId}"/>
+      <orderEntry type="module-library">
+        <library name="${dep.artifactId}">
+          <CLASSES>
+            <root url="jar://${lib.path}!/"/>
+          </CLASSES>
+          <JAVADOC/>
+          <SOURCES/>
+        </library>
+      </orderEntry>
+     -->  
+    <output url="file://$MODULE_DIR$/target/classes"/>
+    <output-test url="file://$MODULE_DIR$/target/test-classes"/>
+    <orderEntry type="module" module-name="apache-composer-tck"/>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar:///Installed/M2_HOME/repository/org/jmock/jmock-junit4/2.4.0/jmock-junit4-2.4.0.jar!/"/>
+        </CLASSES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar:///Installed/M2_HOME/repository/org/jmock/jmock/2.4.0/jmock-2.4.0.jar!/"/>
+        </CLASSES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar:///Installed/M2_HOME/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/"/>
+        </CLASSES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar:///Installed/M2_HOME/repository/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar!/"/>
+        </CLASSES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar:///Installed/M2_HOME/repository/junit/junit-dep/4.4/junit-dep-4.4.jar!/"/>
+        </CLASSES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar:///Installed/M2_HOME/repository/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar!/"/>
+        </CLASSES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar:///Installed/M2_HOME/repository/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar!/"/>
+        </CLASSES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module" module-name="apache-composer-core"/>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar:///Installed/M2_HOME/repository/com/thoughtworks/paranamer/paranamer/1.1/paranamer-1.1.jar!/"/>
+        </CLASSES>
+      </library>
+    </orderEntry>
+  </component>  
+  <component name="ModuleRootManager"/>  
+  <!-- If it's a war project:
+  <component name="WebModuleProperties">
+    <containerElement type="module" name="${dep.artifactId}">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/classes" />
+    </containerElement>
+    <containerElement type="library" level="module" name="${dep.artifactId}">
+      <attribute name="method" value="1" />
+      <attribute name="URI" value="/WEB-INF/lib/${dep.systemPath.name}" />
+    </containerElement>
+    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/${pom.build.warSourceDirectory}/WEB-INF/web.xml" version="" />
+    <webroots>
+      <root url="file://$MODULE_DIR$/${pom.build.warSourceDirectory}" relative="/" />
+    </webroots>
+  </component>
+  --> 
+</module>

Modified: incubator/composer/trunk/composer-site/pom.xml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-site/pom.xml?rev=618176&r1=618175&r2=618176&view=diff
==============================================================================
--- incubator/composer/trunk/composer-site/pom.xml (original)
+++ incubator/composer/trunk/composer-site/pom.xml Sun Feb  3 22:40:46 2008
@@ -6,9 +6,9 @@
     <artifactId>apache-composer</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>apache-composer-distribution</artifactId>
+  <artifactId>apache-composer-site</artifactId>
   <packaging>pom</packaging>
-  <name>Apache Composer Distribution</name>
+  <name>Apache Composer Site</name>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>

Modified: incubator/composer/trunk/composer-tck/apache-composer-tck.iml
URL: http://svn.apache.org/viewvc/incubator/composer/trunk/composer-tck/apache-composer-tck.iml?rev=618176&r1=618175&r2=618176&view=diff
==============================================================================
--- incubator/composer/trunk/composer-tck/apache-composer-tck.iml (original)
+++ incubator/composer/trunk/composer-tck/apache-composer-tck.iml Sun Feb  3 22:40:46 2008
@@ -17,62 +17,62 @@
     <orderEntry type="sourceFolder" forTests="false"/>  
     <orderEntry type="module" module-name="apache-composer-core" exported=""/>  
     <orderEntryProperties/>  
-    <orderEntry type="module-library">
-      <library>
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/jmock/jmock-junit4/2.4.0/jmock-junit4-2.4.0.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/jmock/jmock/2.4.0/jmock-2.4.0.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/junit/junit-dep/4.4/junit-dep-4.4.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
+      </library> 
+    </orderEntry>  
+    <orderEntry type="module-library"> 
+      <library> 
         <CLASSES>
           <root url="jar:///Installed/M2_HOME/repository/com/thoughtworks/paranamer/paranamer/1.1/paranamer-1.1.jar!/"/>
         </CLASSES>
-      </library>
-    </orderEntry>
+      </library> 
+    </orderEntry> 
   </component>  
   <component name="copyright"> 
     <Base>