cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jheym...@apache.org
Subject svn commit: r280377 - in /cocoon: blocks/faces/trunk/ blocks/faces/trunk/pom.xml blocks/portal/trunk/ blocks/portal/trunk/pom.xml blocks/taglib/trunk/ blocks/taglib/trunk/pom.xml trunk/pom.xml
Date Mon, 12 Sep 2005 17:37:43 GMT
Author: jheymans
Date: Mon Sep 12 10:37:36 2005
New Revision: 280377

URL: http://svn.apache.org/viewcvs?rev=280377&view=rev
Log:
Adding faces, portal and taglib block for compilation to maven2 build. I have uploaded the
necessary dependencies to the cvs.apache.org repository, except for the pluto-1.0.1-rc4 which
is still pending.

Added:
    cocoon/blocks/faces/trunk/pom.xml   (with props)
    cocoon/blocks/taglib/trunk/pom.xml   (with props)
Modified:
    cocoon/blocks/faces/trunk/   (props changed)
    cocoon/blocks/portal/trunk/   (props changed)
    cocoon/blocks/portal/trunk/pom.xml
    cocoon/blocks/taglib/trunk/   (props changed)
    cocoon/trunk/pom.xml

Propchange: cocoon/blocks/faces/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 12 10:37:36 2005
@@ -0,0 +1,4 @@
+build
+.project
+.classpath
+target

Added: cocoon/blocks/faces/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/faces/trunk/pom.xml?rev=280377&view=auto
==============================================================================
--- cocoon/blocks/faces/trunk/pom.xml (added)
+++ cocoon/blocks/faces/trunk/pom.xml Mon Sep 12 10:37:36 2005
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 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.
+-->
+<!--+
+    | @version $Id:$
+    |
+    +-->
+<project>
+  <parent>
+    <groupId>apache-cocoon</groupId>
+    <artifactId>cocoon</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>apache-cocoon</groupId>
+  <artifactId>cocoon-faces</artifactId>
+  <version>2.2-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <build>
+    <sourceDirectory>java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>myfaces</groupId>
+      <artifactId>myfaces-api</artifactId>
+      <version>r233484</version>
+    </dependency>
+    <dependency>
+      <groupId>myfaces</groupId>
+      <artifactId>myfaces-impl</artifactId>
+      <version>r233484</version>
+    </dependency>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-taglib</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-portal</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>

Propchange: cocoon/blocks/faces/trunk/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/portal/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Sep 12 10:37:36 2005
@@ -1 +1,4 @@
+build
+.project
+.classpath
 target

Modified: cocoon/blocks/portal/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/pom.xml?rev=280377&r1=280376&r2=280377&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/pom.xml (original)
+++ cocoon/blocks/portal/trunk/pom.xml Mon Sep 12 10:37:36 2005
@@ -19,6 +19,11 @@
     |
     +-->
 <project>
+  <parent>
+    <groupId>apache-cocoon</groupId>
+    <artifactId>cocoon</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>apache-cocoon</groupId>
   <artifactId>cocoon-portal</artifactId>
@@ -97,7 +102,7 @@
       <version>0.2</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.pluto</groupId>
+      <groupId>pluto</groupId>
       <artifactId>pluto</artifactId>
       <version>1.0.1-rc4</version>
     </dependency>
@@ -113,28 +118,37 @@
       <version>2.3</version>
       <scope>provided</scope>
     </dependency>
-<!-- 
-    <library name="nekohtml"/>
-    <library name="portals-bridges-common"/>
-    <library name="cowarp"/>
-    <library name="wsrp4j-shared"/>
-    <library name="wsrp4j-consumer"/>
- -->
+    <dependency>
+      <groupId>wsrp4j</groupId>
+      <artifactId>wsrp4j-consumer</artifactId>
+      <version>0.3-dev</version>
+    </dependency>
+    <dependency>
+      <groupId>wsrp4j</groupId>
+      <artifactId>wsrp4j-shared</artifactId>
+      <version>0.3-dev</version>
+    </dependency>
+    <dependency>
+      <groupId>portals-bridges</groupId>
+      <artifactId>portals-bridges-common</artifactId>
+      <version>0.4-20050815</version>
+    </dependency>
+    <dependency>
+      <groupId>nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
+      <version>0.9.5</version>
+    </dependency>
+    <dependency>
+      <groupId>nekohtml</groupId>
+      <artifactId>nekodtd</artifactId>
+      <version>0.1.11</version>
+    </dependency>
+    <dependency>
+      <groupId>cowarp</groupId>
+      <artifactId>cowarp</artifactId>
+      <version>0.3</version>
+    </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>apache</id>
-      <name>Apache Java Repository</name>
-      <url>http://www.apache.org/dist/java-repository</url>
-      <layout>legacy</layout>
-    </repository>
-    <repository>
-      <id>apache-cvs</id>
-      <name>Apache CVS Repository</name>
-      <url>http://cvs.apache.org/repository</url>
-      <layout>legacy</layout>
-    </repository>
-  </repositories>
   <reporting>
     <plugins>
       <plugin>

Propchange: cocoon/blocks/taglib/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 12 10:37:36 2005
@@ -0,0 +1,4 @@
+build
+.project
+.classpath
+target

Added: cocoon/blocks/taglib/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/taglib/trunk/pom.xml?rev=280377&view=auto
==============================================================================
--- cocoon/blocks/taglib/trunk/pom.xml (added)
+++ cocoon/blocks/taglib/trunk/pom.xml Mon Sep 12 10:37:36 2005
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 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.
+-->
+<!--+
+    | @version $Id:$
+    |
+    +-->
+<project>
+  <parent>
+    <groupId>apache-cocoon</groupId>
+    <artifactId>cocoon</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>apache-cocoon</groupId>
+  <artifactId>cocoon-taglib</artifactId>
+  <version>2.2-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <build>
+    <sourceDirectory>java</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>jspapi</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+    </dependency>  
+  </dependencies>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>

Propchange: cocoon/blocks/taglib/trunk/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=280377&r1=280376&r2=280377&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Mon Sep 12 10:37:36 2005
@@ -38,10 +38,13 @@
     <module>src/blocks/chaperon/trunk</module>
     <module>src/blocks/cron/trunk</module>
     <module>src/blocks/deli/trunk</module>
+    <module>src/blocks/faces/trunk</module>
     <module>src/blocks/fop/trunk</module>
     <module>src/blocks/forms/trunk</module>
+    <module>src/blocks/portal/trunk</module>
     <module>src/blocks/session-fw/trunk</module>
     <module>src/blocks/spring-app/trunk</module>
+    <module>src/blocks/taglib/trunk</module>
     <module>src/blocks/template/trunk</module>
   </modules>
   <repositories>



Mime
View raw message