svn commit: r1052276 - in /lenya/branches/BRANCH_2_1_X/src: impl/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java impl/java/org/apache/lenya/cms/repository/RandomUuidGenerator.java webapp/lenya/config/cocoon-xconf/misc/uuid-generator.xconf

Author: froethenbacher
Date: Thu Dec 23 14:18:22 2010
New Revision: 1052276

URL: http://svn.apache.org/viewvc?rev=1052276&view=rev
Log:
Replaced Axis UUID generator with standard Java one.

Added:
    lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/repository/RandomUuidGenerator.java
Modified:
    lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java
    lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/cocoon-xconf/misc/uuid-generator.xconf

Modified: lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java?rev=1052276&r1=1052275&r2=1052276&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/repository/AxisUUIDGenerator.java Thu Dec 23 14:18:22 2010
@@ -24,6 +24,8 @@ import org.apache.axis.components.uuid.U
 
 /**
  * UUID generator based on Apache Axis.
+ *
+ * @deprecated
  */
 public class AxisUUIDGenerator extends AbstractLogEnabled implements UUIDGenerator, ThreadSafe {
 

Added: lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/repository/RandomUuidGenerator.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/repository/RandomUuidGenerator.java?rev=1052276&view=auto
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/repository/RandomUuidGenerator.java (added)
+++ lenya/branches/BRANCH_2_1_X/src/impl/java/org/apache/lenya/cms/repository/RandomUuidGenerator.java Thu Dec 23 14:18:22 2010
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ *
+ */
+package org.apache.lenya.cms.repository;
+
+import java.util.UUID;
+
+/**
+ * UUID generator based on Java random UUID's.
+ */
+public class RandomUuidGenerator implements UUIDGenerator {
+
+    @Override
+    public String nextUUID() {
+        UUID uuid = UUID.randomUUID();
+        return uuid.toString();
+    }
+
+}

Modified: lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/cocoon-xconf/misc/uuid-generator.xconf
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/cocoon-xconf/misc/uuid-generator.xconf?rev=1052276&r1=1052275&r2=1052276&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/cocoon-xconf/misc/uuid-generator.xconf (original)
+++ lenya/branches/BRANCH_2_1_X/src/webapp/lenya/config/cocoon-xconf/misc/uuid-generator.xconf Thu Dec 23 14:18:22 2010
@@ -24,5 +24,5 @@
   <xconf xpath="/cocoon" unless="/cocoon/component[@role = 'org.apache.lenya.cms.repository.UUIDGenerator']">
     <component role="org.apache.lenya.cms.repository.UUIDGenerator"
       logger="lenya.cocoon.components"
-      class="org.apache.lenya.cms.repository.AxisUUIDGenerator"/>
+      class="org.apache.lenya.cms.repository.RandomUuidGenerator"/>
   </xconf>