[Yanel-commits] rev 21140 - in public/yanel/trunk/src: build contributions/resources/atom/src/build contributions/resources/atom-entry/src/build contributions/resources/contact-form/src/build contributions/resources/davcollection/src/build contributions/resources/nutch/src/build contributions/resources/pdf/src/build contributions/resources/wiki/src/build contributions/resources/zip/src/build realms/welcome-admin/yanel/resources/show-realms/src/build realms/yanel-website/content/about resources/directory/src/build resources/file/src/build resources/from-scratch-resource-template/src/build resources/importsite resources/importsite/src/build resources/invoice resources/invoice/src/build resources/odt/src/build resources/tape resources/tape/src/build resources/testing-control/src/build resources/websearch/src/build resources/xml/src/build

josias at wyona.com josias at wyona.com
Sun Dec 24 11:40:51 CET 2006


Author: josias
Date: 2006-12-24 11:40:47 +0100 (Sun, 24 Dec 2006)
New Revision: 21140

Modified:
   public/yanel/trunk/src/build/pom-core.xml
   public/yanel/trunk/src/contributions/resources/atom-entry/src/build/dependencies.xml
   public/yanel/trunk/src/contributions/resources/atom/src/build/dependencies.xml
   public/yanel/trunk/src/contributions/resources/contact-form/src/build/dependencies.xml
   public/yanel/trunk/src/contributions/resources/davcollection/src/build/dependencies.xml
   public/yanel/trunk/src/contributions/resources/nutch/src/build/dependencies.xml
   public/yanel/trunk/src/contributions/resources/pdf/src/build/dependencies.xml
   public/yanel/trunk/src/contributions/resources/wiki/src/build/dependencies.xml
   public/yanel/trunk/src/contributions/resources/zip/src/build/dependencies.xml
   public/yanel/trunk/src/realms/welcome-admin/yanel/resources/show-realms/src/build/dependencies.xml
   public/yanel/trunk/src/realms/yanel-website/content/about/en.xhtml
   public/yanel/trunk/src/resources/directory/src/build/dependencies.xml
   public/yanel/trunk/src/resources/file/src/build/dependencies.xml
   public/yanel/trunk/src/resources/from-scratch-resource-template/src/build/dependencies.xml
   public/yanel/trunk/src/resources/importsite/build.xml
   public/yanel/trunk/src/resources/importsite/src/build/dependencies.xml
   public/yanel/trunk/src/resources/invoice/build.xml
   public/yanel/trunk/src/resources/invoice/src/build/dependencies.xml
   public/yanel/trunk/src/resources/odt/src/build/dependencies.xml
   public/yanel/trunk/src/resources/tape/build.xml
   public/yanel/trunk/src/resources/tape/src/build/dependencies.xml
   public/yanel/trunk/src/resources/testing-control/src/build/dependencies.xml
   public/yanel/trunk/src/resources/websearch/src/build/dependencies.xml
   public/yanel/trunk/src/resources/xml/src/build/dependencies.xml
Log:
moved common resource dependencies to the core pom. this should make it easier to update e.g. to a new yarep version.

Modified: public/yanel/trunk/src/build/pom-core.xml
===================================================================
--- public/yanel/trunk/src/build/pom-core.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/build/pom-core.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -5,4 +5,42 @@
   <groupId>wyona-org-yanel</groupId>
   <artifactId>yanel-core</artifactId>
   <version>@VERSION@</version>
+  <dependencies>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>yarep</groupId>
+      <artifactId>yarep</artifactId>
+      <version>0.0.1-dev-r21033</version>
+    </dependency>
+    <dependency>
+      <groupId>wyona-org-commons</groupId>
+      <artifactId>wyona-org-commons</artifactId>
+      <version>0.0.1-dev-r19469</version>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.7.1</version>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.3.02</version>
+    </dependency>
+    <dependency>
+      <groupId>xml-resolver</groupId>
+      <artifactId>xml-resolver</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.8</version>
+    </dependency>
+  </dependencies>
 </project>
+

Modified: public/yanel/trunk/src/contributions/resources/atom/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/contributions/resources/atom/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/contributions/resources/atom/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,16 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/contributions/resources/atom-entry/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/contributions/resources/atom-entry/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/contributions/resources/atom-entry/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,23 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
-      <!-- IMPORT: xerces 2.7.1 is dependent on xml-apis 1.3.02 -->
-      <dependency groupId="xerces" artifactId="xercesImpl"
-                  version="2.7.1"/>
-      <dependency groupId="xml-apis" artifactId="xml-apis"
-                  version="1.3.02"/>
-      <dependency groupId="xml-resolver" artifactId="xml-resolver"
-                  version="1.1"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/contributions/resources/contact-form/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/contributions/resources/contact-form/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/contributions/resources/contact-form/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,13 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" version="2.3"
-        scope="provided"/>
-      <dependency groupId="log4j" artifactId="log4j" version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
         version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep" version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons" version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/contributions/resources/davcollection/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/contributions/resources/davcollection/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/contributions/resources/davcollection/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,16 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/contributions/resources/nutch/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/contributions/resources/nutch/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/contributions/resources/nutch/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,16 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/contributions/resources/pdf/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/contributions/resources/pdf/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/contributions/resources/pdf/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,20 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
-      <dependency groupId="xml-resolver" artifactId="xml-resolver"
-                  version="1.1"/>
-      <dependency groupId="fop" artifactId="fop"
-                  version="0.20.5"/>
      </artifact:dependencies>
 
 
@@ -47,6 +35,7 @@
     </artifact:dependencies>
 
     <property name="maven2.cp" refid="maven2.classpath"/>
+    <property name="maven2.resource.cp" refid="maven2.resource.classpath"/>
     <!--<echo>Maven2 classpath: ${maven2.cp}</echo>-->
   </target>
 

Modified: public/yanel/trunk/src/contributions/resources/wiki/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/contributions/resources/wiki/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/contributions/resources/wiki/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,24 +8,15 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
-
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="spring" artifactId="spring"
-                  version="2.0"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
 
+      <dependency groupId="spring" artifactId="spring"
+                  version="2.0"/>
       <dependency groupId="com-ecyrd-jspwiki" artifactId="JSPWiki-patched"
                   version="2.4.71"/>
 

Modified: public/yanel/trunk/src/contributions/resources/zip/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/contributions/resources/zip/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/contributions/resources/zip/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,16 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/realms/welcome-admin/yanel/resources/show-realms/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/realms/welcome-admin/yanel/resources/show-realms/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/realms/welcome-admin/yanel/resources/show-realms/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,14 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" version="2.3"
-        scope="provided"/>
-      <dependency groupId="log4j" artifactId="log4j" version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
         version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep" version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-        version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/realms/yanel-website/content/about/en.xhtml
===================================================================
--- public/yanel/trunk/src/realms/yanel-website/content/about/en.xhtml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/realms/yanel-website/content/about/en.xhtml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,8 +8,8 @@
 </head>
 <body>
 <table width="100%">
-<tr><td align="right"><font size="-1">EN | <a href="../de/ueber.html">DE</a> | <a href="../es/acerca.html">ES</a></font></td></tr>
-</table>
+<tbody><tr><td align="right"><font size="-1">EN | <a href="../de/ueber.html">DE</a> | <a href="../es/acerca.html">ES</a></font></td></tr>
+</tbody></table>
 <h3>About</h3>
 <p>
 Everything is content management (WCMS, DMS, CRM, ERP, E-Mail, DRM, ...) and Yanel
@@ -22,7 +22,7 @@
 
 <h3>Download</h3>
 <p>
-See the <a href="../download.html">download</a> page for information on obtaining releases, snapshots, etc.
+See the <a href="../download.html">download</a> page for information ooon obtaining releases, snapshots, etc.
 </p>
 
 <h3>Main Features</h3>
@@ -38,4 +38,4 @@
   <li>Cross-Platform (Continuously tested on Linux, Mac OS X, Windows)</li>
 </ul>
 </body>
-</html>
+</html>
\ No newline at end of file

Modified: public/yanel/trunk/src/resources/directory/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/resources/directory/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/directory/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,16 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/resources/file/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/resources/file/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/file/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,19 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-<!--
-                  version="0.0.1-dev-r17165"/>
--->
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/resources/from-scratch-resource-template/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/resources/from-scratch-resource-template/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/from-scratch-resource-template/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,23 +8,14 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-impl"
                   version="0.0.1-dev-r17165"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <!-- No resource specific libs yet -->
     </artifact:dependencies>
 
     <property name="maven2.cp" refid="maven2.classpath"/>

Modified: public/yanel/trunk/src/resources/importsite/build.xml
===================================================================
--- public/yanel/trunk/src/resources/importsite/build.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/importsite/build.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -15,6 +15,7 @@
 
     <path id="classpath">
       <pathelement path="${maven2.cp}"/>
+      <pathelement path="${maven2.resource.cp}"/>
     </path>
     <property name="resource.build.dir" value="${resource.home.dir}/build"/>
     <property name="resource.classes.dir" value="${resource.build.dir}/classes"/>

Modified: public/yanel/trunk/src/resources/importsite/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/resources/importsite/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/importsite/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,19 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-<!--
-                  version="0.0.1-dev-r17165"/>
--->
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/resources/invoice/build.xml
===================================================================
--- public/yanel/trunk/src/resources/invoice/build.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/invoice/build.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -15,6 +15,7 @@
 
     <path id="classpath">
       <pathelement path="${maven2.cp}"/>
+      <pathelement path="${maven2.resource.cp}"/>
     </path>
     <property name="resource.build.dir" value="${resource.home.dir}/build"/>
     <property name="resource.classes.dir" value="${resource.build.dir}/classes"/>

Modified: public/yanel/trunk/src/resources/invoice/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/resources/invoice/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/invoice/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,18 +8,10 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-impl"
                   version="0.0.1-dev-r17165"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">
@@ -28,6 +20,7 @@
     </artifact:dependencies>
 
     <property name="maven2.cp" refid="maven2.classpath"/>
+    <!-- <property name="maven2.resource.cp" refid="maven2.resource.classpath"/> -->
     <!--<echo>Maven2 classpath: ${maven2.cp}</echo>-->
   </target>
 

Modified: public/yanel/trunk/src/resources/odt/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/resources/odt/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/odt/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,16 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/resources/tape/build.xml
===================================================================
--- public/yanel/trunk/src/resources/tape/build.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/tape/build.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -15,6 +15,7 @@
 
     <path id="classpath">
       <pathelement path="${maven2.cp}"/>
+      <pathelement path="${maven2.resource.cp}"/>
     </path>
     <property name="resource.build.dir" value="${resource.home.dir}/build"/>
     <property name="resource.classes.dir" value="${resource.build.dir}/classes"/>

Modified: public/yanel/trunk/src/resources/tape/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/resources/tape/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/tape/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,26 +8,18 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-impl"
                   version="0.0.1-dev-r17165"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <!-- No resource specific libs yet -->
     </artifact:dependencies>
 
     <property name="maven2.cp" refid="maven2.classpath"/>
+    <!-- <property name="maven2.resource.cp" refid="maven2.resource.classpath"/> -->
     <!--<echo>Maven2 classpath: ${maven2.cp}</echo>-->
   </target>
 

Modified: public/yanel/trunk/src/resources/testing-control/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/resources/testing-control/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/testing-control/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,14 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" version="2.3"
-        scope="provided"/>
-      <dependency groupId="log4j" artifactId="log4j" version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
         version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep" version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-        version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/resources/websearch/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/resources/websearch/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/websearch/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,16 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">

Modified: public/yanel/trunk/src/resources/xml/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/resources/xml/src/build/dependencies.xml	2006-12-23 21:37:51 UTC (rev 21139)
+++ public/yanel/trunk/src/resources/xml/src/build/dependencies.xml	2006-12-24 10:40:47 UTC (rev 21140)
@@ -8,26 +8,8 @@
 
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" 
-                  version="2.3" scope="provided" />
-      <dependency groupId="log4j" artifactId="log4j"
-                  version="1.2.8"/>
       <dependency groupId="wyona-org-yanel" artifactId="yanel-core"
                   version="${yanel.source.version}"/>
-<!--
-                  version="0.0.1-dev-r17165"/>
--->
-      <dependency groupId="yarep" artifactId="yarep"
-                  version="0.0.1-dev-r21033"/>
-      <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons"
-                  version="0.0.1-dev-r19469"/>
-      <!-- IMPORT: xerces 2.7.1 is dependent on xml-apis 1.3.02 -->
-      <dependency groupId="xerces" artifactId="xercesImpl"
-                  version="2.7.1"/>
-      <dependency groupId="xml-apis" artifactId="xml-apis"
-                  version="1.3.02"/>
-      <dependency groupId="xml-resolver" artifactId="xml-resolver"
-                  version="1.1"/>
     </artifact:dependencies>
 
     <artifact:dependencies pathId="maven2.resource.classpath" filesetId="maven2.resource.fileset">




More information about the Yanel-commits mailing list