cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r278691 - in /cocoon: blocks/authentication-fw/trunk/ blocks/session-fw/trunk/ trunk/ trunk/legal/ trunk/lib/ trunk/lib/core/ trunk/src/java/org/apache/cocoon/components/
Date Mon, 05 Sep 2005 08:26:12 GMT
Author: cziegeler
Date: Mon Sep  5 01:25:57 2005
New Revision: 278691

URL: http://svn.apache.org/viewcvs?rev=278691&view=rev
Log:
Update to latest avalon framework, include session and authentication in m2 build

Added:
    cocoon/trunk/legal/avalon-framework-api-4.3.jar.license.txt
      - copied unchanged from r278682, cocoon/trunk/legal/avalon-framework-api-4.1.5.jar.license.txt
    cocoon/trunk/legal/avalon-framework-impl-4.3.jar.license.txt
      - copied unchanged from r278682, cocoon/trunk/legal/avalon-framework-impl-4.1.5.jar.license.txt
    cocoon/trunk/lib/core/avalon-framework-api-4.3.jar   (with props)
    cocoon/trunk/lib/core/avalon-framework-impl-4.3.jar   (with props)
Removed:
    cocoon/trunk/legal/avalon-framework-api-4.1.5.jar.license.txt
    cocoon/trunk/legal/avalon-framework-impl-4.1.5.jar.license.txt
    cocoon/trunk/lib/core/avalon-framework-api-4.1.5.jar
    cocoon/trunk/lib/core/avalon-framework-impl-4.1.5.jar
Modified:
    cocoon/blocks/authentication-fw/trunk/pom.xml
    cocoon/blocks/session-fw/trunk/pom.xml
    cocoon/trunk/lib/jars.xml
    cocoon/trunk/pom.xml
    cocoon/trunk/src/java/org/apache/cocoon/components/ChainedConfiguration.java
    cocoon/trunk/status.xml

Modified: cocoon/blocks/authentication-fw/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/authentication-fw/trunk/pom.xml?rev=278691&r1=278690&r2=278691&view=diff
==============================================================================
--- cocoon/blocks/authentication-fw/trunk/pom.xml (original)
+++ cocoon/blocks/authentication-fw/trunk/pom.xml Mon Sep  5 01:25:57 2005
@@ -31,8 +31,6 @@
         <directory>java</directory>
         <excludes>
           <exclude>**/*.java</exclude>
-          <exclude>**/.svn</exclude>
-          <exclude>**/.svn/**</exclude>
         </excludes>
       </resource>
     </resources>
@@ -47,31 +45,6 @@
       <groupId>apache-cocoon</groupId>
       <artifactId>cocoon-session-fw</artifactId>
       <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
-      <version>4.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-      <version>4.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>excalibur-pool</groupId>
-      <artifactId>excalibur-pool-api</artifactId>
-      <version>2.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>excalibur-sourceresolve</groupId>
-      <artifactId>excalibur-sourceresolve</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>excalibur-xmlutil</groupId>
-      <artifactId>excalibur-xmlutil</artifactId>
-      <version>1.0</version>
     </dependency>
   </dependencies>
   <repositories>

Modified: cocoon/blocks/session-fw/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/session-fw/trunk/pom.xml?rev=278691&r1=278690&r2=278691&view=diff
==============================================================================
--- cocoon/blocks/session-fw/trunk/pom.xml (original)
+++ cocoon/blocks/session-fw/trunk/pom.xml Mon Sep  5 01:25:57 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     |
     +-->
 <project>
@@ -31,8 +31,6 @@
         <directory>java</directory>
         <excludes>
           <exclude>**/*.java</exclude>
-          <exclude>**/.svn</exclude>
-          <exclude>**/.svn/**</exclude>
         </excludes>
       </resource>
     </resources>
@@ -42,31 +40,6 @@
       <groupId>apache-cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
       <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
-      <version>4.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-      <version>4.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>excalibur-pool</groupId>
-      <artifactId>excalibur-pool-api</artifactId>
-      <version>2.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>excalibur-sourceresolve</groupId>
-      <artifactId>excalibur-sourceresolve</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>excalibur-xmlutil</groupId>
-      <artifactId>excalibur-xmlutil</artifactId>
-      <version>1.0</version>
     </dependency>
   </dependencies>
   <repositories>

Added: cocoon/trunk/lib/core/avalon-framework-api-4.3.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/core/avalon-framework-api-4.3.jar?rev=278691&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/lib/core/avalon-framework-api-4.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cocoon/trunk/lib/core/avalon-framework-impl-4.3.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/core/avalon-framework-impl-4.3.jar?rev=278691&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/lib/core/avalon-framework-impl-4.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cocoon/trunk/lib/jars.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/jars.xml?rev=278691&r1=278690&r2=278691&view=diff
==============================================================================
--- cocoon/trunk/lib/jars.xml (original)
+++ cocoon/trunk/lib/jars.xml Mon Sep  5 01:25:57 2005
@@ -185,7 +185,7 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/avalon-framework-api-4.1.5.jar</lib>
+    <lib>core/avalon-framework-api-4.3.jar</lib>
     <homepage>http://excalibur.apache.org/framework/index.html</homepage>
   </file>
 
@@ -196,7 +196,7 @@
       support high level server development.
     </description>
     <used-by>Cocoon</used-by>
-    <lib>core/avalon-framework-impl-4.1.5.jar</lib>
+    <lib>core/avalon-framework-impl-4.3.jar</lib>
     <homepage>http://excalibur.apache.org/framework/index.html</homepage>
   </file>
 

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=278691&r1=278690&r2=278691&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Mon Sep  5 01:25:57 2005
@@ -29,5 +29,7 @@
   <modules>
     <module>core</module>
     <module>webapp</module>
+    <module>src/blocks/authentication-fw/trunk</module>
+    <module>src/blocks/session-fw/trunk</module>
   </modules>
 </project>

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/ChainedConfiguration.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/ChainedConfiguration.java?rev=278691&r1=278690&r2=278691&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/ChainedConfiguration.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/ChainedConfiguration.java Mon Sep 
5 01:25:57 2005
@@ -249,4 +249,32 @@
         return this.wrappedConfiguration.getValueAsLong(arg0);
     }
 
+    /**
+     * @see org.apache.avalon.framework.configuration.Configuration#getAttributeAsDouble(java.lang.String,
double)
+     */
+    public double getAttributeAsDouble(String arg0, double arg1) {
+        return this.wrappedConfiguration.getAttributeAsDouble(arg0, arg1);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.configuration.Configuration#getAttributeAsDouble(java.lang.String)
+     */
+    public double getAttributeAsDouble(String arg0) throws ConfigurationException {
+        return this.wrappedConfiguration.getAttributeAsDouble(arg0);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.configuration.Configuration#getValueAsDouble()
+     */
+    public double getValueAsDouble() throws ConfigurationException {
+        return this.wrappedConfiguration.getValueAsDouble();
+    }
+
+    /**
+     * @see org.apache.avalon.framework.configuration.Configuration#getValueAsDouble(double)
+     */
+    public double getValueAsDouble(double arg0) {
+        return this.wrappedConfiguration.getValueAsDouble(arg0);
+    }
+
 }

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=278691&r1=278690&r2=278691&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Mon Sep  5 01:25:57 2005
@@ -197,6 +197,9 @@
 
   <changes>
   <release version="@version@" date="@date@">
+    <action dev="CZ" type="update">
+      Update Avalon framework to 4.3.
+    </action>
     <action dev="LG" type="fix" fixes-bug="35845" due-to="Henric Mueller" due-to-email="henric@trillian.se">
       JXTG: jx:formatDate and jx:formatNumber allows for specifying locale string instead
of a Locale object
     </action>



Mime
View raw message