You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/10/24 21:06:14 UTC
svn commit: r328135 - in /cocoon/blocks/portal/trunk/java/org/apache/cocoon:
components/persistence/ portal/ portal/coplet/ portal/layout/
portal/persistence/ portal/persistence/castor/ portal/pluto/
portal/profile/impl/ portal/tools/copletManagement/g...
Author: cziegeler
Date: Mon Oct 24 12:02:33 2005
New Revision: 328135
URL: http://svn.apache.org/viewcvs?rev=328135&view=rev
Log:
Move castor related stuff into own package
Added:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AbstractFieldHandler.java
- copied, changed from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AbstractFieldHandler.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AttributedMapItem.java
- copied, changed from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AttributedMapItem.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AttributesFieldHandler.java
- copied, changed from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java
- copied, changed from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/ConfigurationFieldHandler.java
- copied, changed from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/ConfigurationFieldHandler.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/ConverterException.java
- copied, changed from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/ConverterException.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletbasedata.xml
- copied, changed from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletbasedata.xml
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletdata.xml
- copied, changed from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletdata.xml
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletinstancedata.xml
- copied, changed from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletinstancedata.xml
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/layout.xml
- copied unchanged from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/layout.xml
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/portal-castor.roles (with props)
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal-pluto.roles (contents, props changed)
- copied, changed from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal.roles
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal-wsrp.roles (contents, props changed)
- copied, changed from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal.roles
Removed:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/ConverterException.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletbasedata.xml
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletdata.xml
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletinstancedata.xml
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/layout.xml
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal.roles
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AbstractFieldHandler.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AttributedMapItem.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/ConfigurationFieldHandler.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal.roles
Modified:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles (contents, props changed)
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/copletManagement/generation/XMLProfileGenerator.java
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java?rev=328135&r1=328134&r2=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java Mon Oct 24 12:02:33 2005
@@ -22,8 +22,8 @@
import java.util.HashSet;
import java.util.Iterator;
+import org.apache.cocoon.portal.persistence.castor.AttributedMapItem;
import org.apache.cocoon.portal.pluto.om.common.PreferenceSetImpl;
-import org.apache.cocoon.portal.util.AttributedMapItem;
import org.apache.pluto.om.common.PreferenceSet;
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AbstractFieldHandler.java (from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AbstractFieldHandler.java)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AbstractFieldHandler.java?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AbstractFieldHandler.java&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AbstractFieldHandler.java&r1=328095&r2=328135&rev=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AbstractFieldHandler.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AbstractFieldHandler.java Mon Oct 24 12:02:33 2005
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.portal.util;
+package org.apache.cocoon.portal.persistence.castor;
/**
- * Base field handler implementation
+ * Base field handler implementation.
*
* @version $Id$
*/
public abstract class AbstractFieldHandler
extends org.exolab.castor.mapping.AbstractFieldHandler {
- /* (non-Javadoc)
+ /**
* @see org.exolab.castor.mapping.ExtendedFieldHandler#newInstance(java.lang.Object, java.lang.Object[])
*/
public Object newInstance(Object arg0, Object[] arg1) {
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AttributedMapItem.java (from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AttributedMapItem.java)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AttributedMapItem.java?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AttributedMapItem.java&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AttributedMapItem.java&r1=328095&r2=328135&rev=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AttributedMapItem.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AttributedMapItem.java Mon Oct 24 12:02:33 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.portal.util;
+package org.apache.cocoon.portal.persistence.castor;
/**
@@ -24,7 +24,7 @@
* @version $Id$
*/
public class AttributedMapItem
-extends org.exolab.castor.mapping.MapItem {
+ extends org.exolab.castor.mapping.MapItem {
public AttributedMapItem() {
super();
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AttributesFieldHandler.java (from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AttributesFieldHandler.java?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AttributesFieldHandler.java&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java&r1=328095&r2=328135&rev=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/AttributesFieldHandler.java Mon Oct 24 12:02:33 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.portal.util;
+package org.apache.cocoon.portal.persistence.castor;
import java.util.HashMap;
import java.util.Iterator;
@@ -28,7 +28,7 @@
*
* FIXME This is a little bit hacky and should be changed by using
* reflection
- *
+ *
* @version $Id$
*/
public class AttributesFieldHandler extends AbstractFieldHandler {
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java (from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java&r1=328095&r2=328135&rev=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java Mon Oct 24 12:02:33 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.components.persistence;
+package org.apache.cocoon.portal.persistence.castor;
import java.io.InputStream;
import java.io.OutputStream;
@@ -118,11 +118,11 @@
*/
public void configure(Configuration config) throws ConfigurationException {
// default configuration
- final String prefix = "resource://org/apache/cocoon/portal/";
- this.mappingSources.put("layout", prefix + "layout/layout.xml");
- this.mappingSources.put("copletbasedata", prefix + "coplet/copletbasedata.xml");
- this.mappingSources.put("copletdata", prefix + "coplet/copletdata.xml");
- this.mappingSources.put("copletinstancedata", prefix + "coplet/copletinstancedata.xml");
+ final String prefix = "resource://org/apache/cocoon/portal/persistence/castor/";
+ this.mappingSources.put("layout", prefix + "layout.xml");
+ this.mappingSources.put("copletbasedata", prefix + "copletbasedata.xml");
+ this.mappingSources.put("copletdata", prefix + "copletdata.xml");
+ this.mappingSources.put("copletinstancedata", prefix + "copletinstancedata.xml");
// the custom configuration might overwrite the default config
Configuration[] children = config.getChildren("mapping-source");
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/ConfigurationFieldHandler.java (from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/ConfigurationFieldHandler.java)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/ConfigurationFieldHandler.java?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/ConfigurationFieldHandler.java&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/ConfigurationFieldHandler.java&r1=328095&r2=328135&rev=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/util/ConfigurationFieldHandler.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/ConfigurationFieldHandler.java Mon Oct 24 12:02:33 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.portal.util;
+package org.apache.cocoon.portal.persistence.castor;
import java.util.HashMap;
import java.util.Iterator;
@@ -28,7 +28,7 @@
* @version $Id$
*/
public class ConfigurationFieldHandler extends AbstractFieldHandler {
-
+
public Object getValue(Object object) {
HashMap map = new HashMap();
Iterator iterator =
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/ConverterException.java (from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/ConverterException.java)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/ConverterException.java?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/ConverterException.java&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/ConverterException.java&r1=328095&r2=328135&rev=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/components/persistence/ConverterException.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/ConverterException.java Mon Oct 24 12:02:33 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cocoon.components.persistence;
+package org.apache.cocoon.portal.persistence.castor;
import org.apache.avalon.framework.CascadingException;
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletbasedata.xml (from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletbasedata.xml)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletbasedata.xml?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletbasedata.xml&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletbasedata.xml&r1=328095&r2=328135&rev=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletbasedata.xml (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletbasedata.xml Mon Oct 24 12:02:33 2005
@@ -39,7 +39,7 @@
<bind-xml name="coplet-adapter" />
</field>
- <field name="copletConfig" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.ConfigurationFieldHandler">
+ <field name="copletConfig" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.persistence.castor.ConfigurationFieldHandler">
<bind-xml name="configuration"/>
</field>
</class>
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletdata.xml (from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletdata.xml)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletdata.xml?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletdata.xml&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletdata.xml&r1=328095&r2=328135&rev=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletdata.xml (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletdata.xml Mon Oct 24 12:02:33 2005
@@ -48,7 +48,7 @@
<bind-xml name="roles"/>
</field>
- <field name="attributes" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.util.AttributesFieldHandler">
+ <field name="attributes" type="org.exolab.castor.mapping.MapItem" collection="map" handler="org.apache.cocoon.portal.persistence.castor.AttributesFieldHandler">
<bind-xml name="attribute"/>
</field>
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletinstancedata.xml (from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletinstancedata.xml)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletinstancedata.xml?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletinstancedata.xml&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletinstancedata.xml&r1=328095&r2=328135&rev=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/copletinstancedata.xml (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/copletinstancedata.xml Mon Oct 24 12:02:33 2005
@@ -63,7 +63,7 @@
<bind-xml name="coplet-data" reference="true"/>
</field>
- <field name="attributes" type="org.apache.cocoon.portal.util.AttributedMapItem" collection="collection"
+ <field name="attributes" type="org.apache.cocoon.portal.persistence.castor.AttributedMapItem" collection="collection"
get-method="getCastorAttributes" set-method="addAttribute">
<bind-xml name="attribute" node="element"/>
</field>
@@ -92,7 +92,7 @@
<!-- If you prefer to specify the name and value as attributes of the attribute element
just add node="attribute" to the bind-xml elements -->
- <class name="org.apache.cocoon.portal.util.AttributedMapItem">
+ <class name="org.apache.cocoon.portal.persistence.castor.AttributedMapItem">
<field name="key" type="java.lang.String">
<bind-xml name="name"/>
</field>
Added: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/portal-castor.roles
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/portal-castor.roles?rev=328135&view=auto
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/portal-castor.roles (added)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/portal-castor.roles Mon Oct 24 12:02:33 2005
@@ -0,0 +1,27 @@
+<!--
+ 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.
+-->
+<!-- $Id$ -->
+<role-list>
+
+ <!--+
+ | Castor Converter
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.persistence.castor.CastorSourceConverter"
+ default-class="org.apache.cocoon.portal.persistence.castor.CastorSourceConverter"
+ shorthand="castor-converter"/>
+
+</role-list>
\ No newline at end of file
Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/portal-castor.roles
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/persistence/castor/portal-castor.roles
------------------------------------------------------------------------------
svn:keywords = Id
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal-pluto.roles (from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal.roles)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal-pluto.roles?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal-pluto.roles&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal.roles&r1=328095&r2=328135&rev=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal.roles (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal-pluto.roles Mon Oct 24 12:02:33 2005
@@ -1,36 +1,36 @@
-<!--
- 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.
--->
-<!-- $Id$ -->
-<role-list>
-
- <!--+
- | Renderer Aspects
- |
- +-->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/portlet-window"
- default-class="org.apache.cocoon.portal.pluto.adapter.PortletWindowAspect"/>
-
- <!--+
- | Coplet Adapters
- |
- +-->
- <!--+
- | This is the JSR-168 adapter.
- +-->
- <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/portlet"
- default-class="org.apache.cocoon.portal.pluto.adapter.PortletAdapter"/>
-
+<!--
+ 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.
+-->
+<!-- $Id$ -->
+<role-list>
+
+ <!--+
+ | Renderer Aspects
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/portlet-window"
+ default-class="org.apache.cocoon.portal.pluto.adapter.PortletWindowAspect"/>
+
+ <!--+
+ | Coplet Adapters
+ |
+ +-->
+ <!--+
+ | This is the JSR-168 adapter.
+ +-->
+ <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/portlet"
+ default-class="org.apache.cocoon.portal.pluto.adapter.PortletAdapter"/>
+
</role-list>
Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal-pluto.roles
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/portal-pluto.roles
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles?rev=328135&r1=328134&r2=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles Mon Oct 24 12:02:33 2005
@@ -1,246 +1,243 @@
-<!--
- 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.
--->
-<!-- $Id$ -->
-<role-list>
-
- <!--+
- | Event Aspects
- |
- +-->
- <!-- Legacy service selector. -->
- <role name="org.apache.cocoon.portal.event.aspect.EventAspectSelector"
- default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
-
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/action-counter"
- default-class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"/>
-
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/request-parameter"
- default-class="org.apache.cocoon.portal.event.aspect.impl.RequestParameterEventAspect"/>
-
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/frame"
- default-class="org.apache.cocoon.portal.event.aspect.impl.FrameEventAspect"/>
-
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/link"
- default-class="org.apache.cocoon.portal.event.aspect.impl.LinkEventAspect"/>
-
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/page-label"
- default-class="org.apache.cocoon.portal.event.aspect.impl.PageLabelEventAspect"/>
-
- <!--+
- | This aspect sets headers on the response telling the client to not cache
- | the response.
- +-->
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/no-client-caching"
- default-class="org.apache.cocoon.portal.event.aspect.impl.NoClientCachingEventAspect"/>
-
-
- <!--+
- | Portal Manager Aspects
- |
- +-->
- <!-- Legacy service selector. -->
- <role name="org.apache.cocoon.portal.PortalManagerAspectSelector"
- default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
-
-
- <!--+
- | Renderer Aspects
- |
- +-->
- <!-- Legacy service selector. -->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectSelector"
- default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/composite-content"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CompositeContentAspect"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/tab-content"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.TabContentAspect"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/window"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.WindowAspect"/>
-
- <!--+
- | This aspect can be used to render the minimize/maximize buttons.
- +-->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-sizing"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.SizingAspect"/>
-
- <!--+
- | This aspect can be used to render the remove button.
- +-->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-removing"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.RemovableAspect"/>
-
- <!--+
- | This aspect can be used to render cinclude statements that will be used to include
- | the coplet content, use the coplet aspect below to directly stream the content.
- +-->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-cinclude"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CIncludeCopletAspect"/>
-
- <!--+
- | This aspect creates a history of all layout aspect datas,
- | coplet aspect datas and coplet attributes. It can be used by
- | the bookmark action to browse the history.
- +-->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/history"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.HistoryAspect"/>
-
- <!--+
- | This aspect can be used to render the content of the coplet.
- +-->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.DefaultCopletAspect"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/frame"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.FrameAspect"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/xslt"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.XSLTAspect"/>
-
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/parameter"
- default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.ParameterAspect"/>
-
-
- <!--+
- | Components.
- |
- +-->
- <role name="org.apache.cocoon.components.persistence.CastorSourceConverter"
- default-class="org.apache.cocoon.components.persistence.CastorSourceConverter"/>
-
- <role name="org.apache.cocoon.portal.profile.ProfileLS"
- default-class="org.apache.cocoon.portal.profile.impl.MapProfileLS"/>
-
- <!--+
- | Coplet Adapters
- |
- +-->
- <!-- Legacy service selector. -->
- <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapterSelector"
- default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
-
- <!--+
- | This is the pipeline/uri based adapter.
- +-->
- <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/uri"
- default-class="org.apache.cocoon.portal.coplet.adapter.impl.URICopletAdapter"/>
-
- <!--+
- | This is an extension of the uri adapter supporting caching the content.
- +-->
- <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/caching-uri"
- default-class="org.apache.cocoon.portal.coplet.adapter.impl.CachingURICopletAdapter"/>
-
- <!--+
- | This is the application adapter.
- +-->
- <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/application"
- default-class="org.apache.cocoon.portal.coplet.adapter.impl.ApplicationCopletAdapter"/>
-
-
- <!--+
- | Coplet Source.
- |
- +-->
- <role name="org.apache.excalibur.source.SourceFactory/coplet"
- default-class="org.apache.cocoon.portal.source.CopletSourceFactory"/>
-
-
- <!--+
- | Input Modules.
- |
- +-->
- <role name="org.apache.cocoon.components.modules.input.InputModule/coplet"
- default-class="org.apache.cocoon.portal.components.modules.input.CopletModule"/>
- <role name="org.apache.cocoon.components.modules.input.InputModule/portal-layout"
- default-class="org.apache.cocoon.portal.components.modules.input.LayoutModule"/>
- <role name="org.apache.cocoon.components.modules.input.InputModule/portal-skin"
- default-class="org.apache.cocoon.portal.components.modules.input.SkinModule"/>
-
- <!--+
- | Portal Service.
- |
- +-->
- <role name="org.apache.cocoon.portal.PortalService"
- default-class="org.apache.cocoon.portal.impl.PortalServiceImpl"
- shorthand="portal-service"/>
-
- <!--+
- | Portal Manager.
- |
- +-->
- <role name="org.apache.cocoon.portal.PortalManager"
- default-class="org.apache.cocoon.portal.impl.PortalManagerImpl"
- shorthand="portal-manager"/>
-
- <!--+
- | Event Manager.
- |
- +-->
- <role name="org.apache.cocoon.portal.event.EventManager"
- default-class="org.apache.cocoon.portal.event.impl.DefaultEventManager"
- shorthand="portal-event-manager"/>
-
- <!--+
- | Event Converter.
- |
- +-->
- <role name="org.apache.cocoon.portal.event.EventConverter"
- default-class="org.apache.cocoon.portal.event.impl.DefaultEventConverter"
- shorthand="portal-event-converter"/>
-
- <!--+
- | Page Label Manager.
- |
- +-->
- <role name="org.apache.cocoon.portal.impl.PageLabelManager"
- default-class="org.apache.cocoon.portal.impl.PageLabelManager"
- shorthand="page-label-manager"/>
-
- <!--+
- | Portal Link Service.
- |
- +-->
- <role name="org.apache.cocoon.portal.LinkService"
- default-class="org.apache.cocoon.portal.impl.DefaultLinkService"
- shorthand="portal-link-service"/>
-
- <!--+
- | Layout Factory.
- |
- +-->
- <role name="org.apache.cocoon.portal.layout.LayoutFactory"
- default-class="org.apache.cocoon.portal.layout.impl.DefaultLayoutFactory"
- shorthand="portal-layout-factory"/>
-
- <!--+
- | Coplet Factory.
- |
- +-->
- <role name="org.apache.cocoon.portal.coplet.CopletFactory"
- default-class="org.apache.cocoon.portal.coplet.impl.DefaultCopletFactory"
- shorthand="portal-coplet-factory"/>
-
- <!--+
- | Profile Manager.
- |
- +-->
- <role name="org.apache.cocoon.portal.profile.ProfileManager"
- shorthand="portal-profile-manager"/>
-
+<!--
+ 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.
+-->
+<!-- $Id$ -->
+<role-list>
+
+ <!--+
+ | Event Aspects
+ |
+ +-->
+ <!-- Legacy service selector. -->
+ <role name="org.apache.cocoon.portal.event.aspect.EventAspectSelector"
+ default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+
+ <role name="org.apache.cocoon.portal.event.aspect.EventAspect/action-counter"
+ default-class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"/>
+
+ <role name="org.apache.cocoon.portal.event.aspect.EventAspect/request-parameter"
+ default-class="org.apache.cocoon.portal.event.aspect.impl.RequestParameterEventAspect"/>
+
+ <role name="org.apache.cocoon.portal.event.aspect.EventAspect/frame"
+ default-class="org.apache.cocoon.portal.event.aspect.impl.FrameEventAspect"/>
+
+ <role name="org.apache.cocoon.portal.event.aspect.EventAspect/link"
+ default-class="org.apache.cocoon.portal.event.aspect.impl.LinkEventAspect"/>
+
+ <role name="org.apache.cocoon.portal.event.aspect.EventAspect/page-label"
+ default-class="org.apache.cocoon.portal.event.aspect.impl.PageLabelEventAspect"/>
+
+ <!--+
+ | This aspect sets headers on the response telling the client to not cache
+ | the response.
+ +-->
+ <role name="org.apache.cocoon.portal.event.aspect.EventAspect/no-client-caching"
+ default-class="org.apache.cocoon.portal.event.aspect.impl.NoClientCachingEventAspect"/>
+
+
+ <!--+
+ | Portal Manager Aspects
+ |
+ +-->
+ <!-- Legacy service selector. -->
+ <role name="org.apache.cocoon.portal.PortalManagerAspectSelector"
+ default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+
+
+ <!--+
+ | Renderer Aspects
+ |
+ +-->
+ <!-- Legacy service selector. -->
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectSelector"
+ default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/composite-content"
+ default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CompositeContentAspect"/>
+
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/tab-content"
+ default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.TabContentAspect"/>
+
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/window"
+ default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.WindowAspect"/>
+
+ <!--+
+ | This aspect can be used to render the minimize/maximize buttons.
+ +-->
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-sizing"
+ default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.SizingAspect"/>
+
+ <!--+
+ | This aspect can be used to render the remove button.
+ +-->
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-removing"
+ default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.RemovableAspect"/>
+
+ <!--+
+ | This aspect can be used to render cinclude statements that will be used to include
+ | the coplet content, use the coplet aspect below to directly stream the content.
+ +-->
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet-cinclude"
+ default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CIncludeCopletAspect"/>
+
+ <!--+
+ | This aspect creates a history of all layout aspect datas,
+ | coplet aspect datas and coplet attributes. It can be used by
+ | the bookmark action to browse the history.
+ +-->
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/history"
+ default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.HistoryAspect"/>
+
+ <!--+
+ | This aspect can be used to render the content of the coplet.
+ +-->
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/coplet"
+ default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.DefaultCopletAspect"/>
+
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/frame"
+ default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.FrameAspect"/>
+
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/xslt"
+ default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.XSLTAspect"/>
+
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/parameter"
+ default-class="org.apache.cocoon.portal.layout.renderer.aspect.impl.ParameterAspect"/>
+
+
+ <!--+
+ | Components.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.profile.ProfileLS"
+ default-class="org.apache.cocoon.portal.profile.impl.MapProfileLS"/>
+
+ <!--+
+ | Coplet Adapters
+ |
+ +-->
+ <!-- Legacy service selector. -->
+ <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapterSelector"
+ default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
+
+ <!--+
+ | This is the pipeline/uri based adapter.
+ +-->
+ <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/uri"
+ default-class="org.apache.cocoon.portal.coplet.adapter.impl.URICopletAdapter"/>
+
+ <!--+
+ | This is an extension of the uri adapter supporting caching the content.
+ +-->
+ <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/caching-uri"
+ default-class="org.apache.cocoon.portal.coplet.adapter.impl.CachingURICopletAdapter"/>
+
+ <!--+
+ | This is the application adapter.
+ +-->
+ <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/application"
+ default-class="org.apache.cocoon.portal.coplet.adapter.impl.ApplicationCopletAdapter"/>
+
+
+ <!--+
+ | Coplet Source.
+ |
+ +-->
+ <role name="org.apache.excalibur.source.SourceFactory/coplet"
+ default-class="org.apache.cocoon.portal.source.CopletSourceFactory"/>
+
+
+ <!--+
+ | Input Modules.
+ |
+ +-->
+ <role name="org.apache.cocoon.components.modules.input.InputModule/coplet"
+ default-class="org.apache.cocoon.portal.components.modules.input.CopletModule"/>
+ <role name="org.apache.cocoon.components.modules.input.InputModule/portal-layout"
+ default-class="org.apache.cocoon.portal.components.modules.input.LayoutModule"/>
+ <role name="org.apache.cocoon.components.modules.input.InputModule/portal-skin"
+ default-class="org.apache.cocoon.portal.components.modules.input.SkinModule"/>
+
+ <!--+
+ | Portal Service.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.PortalService"
+ default-class="org.apache.cocoon.portal.impl.PortalServiceImpl"
+ shorthand="portal-service"/>
+
+ <!--+
+ | Portal Manager.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.PortalManager"
+ default-class="org.apache.cocoon.portal.impl.PortalManagerImpl"
+ shorthand="portal-manager"/>
+
+ <!--+
+ | Event Manager.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.event.EventManager"
+ default-class="org.apache.cocoon.portal.event.impl.DefaultEventManager"
+ shorthand="portal-event-manager"/>
+
+ <!--+
+ | Event Converter.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.event.EventConverter"
+ default-class="org.apache.cocoon.portal.event.impl.DefaultEventConverter"
+ shorthand="portal-event-converter"/>
+
+ <!--+
+ | Page Label Manager.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.impl.PageLabelManager"
+ default-class="org.apache.cocoon.portal.impl.PageLabelManager"
+ shorthand="page-label-manager"/>
+
+ <!--+
+ | Portal Link Service.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.LinkService"
+ default-class="org.apache.cocoon.portal.impl.DefaultLinkService"
+ shorthand="portal-link-service"/>
+
+ <!--+
+ | Layout Factory.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.layout.LayoutFactory"
+ default-class="org.apache.cocoon.portal.layout.impl.DefaultLayoutFactory"
+ shorthand="portal-layout-factory"/>
+
+ <!--+
+ | Coplet Factory.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.coplet.CopletFactory"
+ default-class="org.apache.cocoon.portal.coplet.impl.DefaultCopletFactory"
+ shorthand="portal-coplet-factory"/>
+
+ <!--+
+ | Profile Manager.
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.profile.ProfileManager"
+ shorthand="portal-profile-manager"/>
+
</role-list>
Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/portal.roles
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java?rev=328135&r1=328134&r2=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java Mon Oct 24 12:02:33 2005
@@ -29,7 +29,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.persistence.CastorSourceConverter;
+import org.apache.cocoon.portal.persistence.castor.CastorSourceConverter;
import org.apache.cocoon.portal.profile.ProfileLS;
import org.apache.cocoon.util.NetUtils;
import org.apache.cocoon.xml.dom.DOMUtil;
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/copletManagement/generation/XMLProfileGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/copletManagement/generation/XMLProfileGenerator.java?rev=328135&r1=328134&r2=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/copletManagement/generation/XMLProfileGenerator.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/copletManagement/generation/XMLProfileGenerator.java Mon Oct 24 12:02:33 2005
@@ -26,9 +26,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.flow.FlowHelper;
-import org.apache.cocoon.components.persistence.CastorSourceConverter;
-import org.apache.cocoon.components.persistence.ConverterException;
import org.apache.cocoon.generation.ServiceableGenerator;
+import org.apache.cocoon.portal.persistence.castor.CastorSourceConverter;
+import org.apache.cocoon.portal.persistence.castor.ConverterException;
import org.apache.commons.jxpath.DynamicPropertyHandler;
import org.apache.commons.jxpath.JXPathBeanInfo;
import org.apache.commons.jxpath.JXPathIntrospector;
@@ -60,7 +60,7 @@
}
try {
Object layout = myMap.get("layout");
- converter = (CastorSourceConverter) this.manager.lookup(org.apache.cocoon.components.persistence.CastorSourceConverter.ROLE);
+ converter = (CastorSourceConverter) this.manager.lookup(org.apache.cocoon.portal.persistence.castor.CastorSourceConverter.ROLE);
ByteArrayOutputStream os = new java.io.ByteArrayOutputStream();
HashMap para = new HashMap();
para.put("profiletype", "layout");
Copied: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal-wsrp.roles (from r328095, cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal.roles)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal-wsrp.roles?p2=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal-wsrp.roles&p1=cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal.roles&r1=328095&r2=328135&rev=328135&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal.roles (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal-wsrp.roles Mon Oct 24 12:02:33 2005
@@ -1,54 +1,54 @@
-<!--
- 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.
--->
-<!-- $Id$ -->
-<role-list>
-
- <!--+
- | Event Aspects
- |
- +-->
- <!--+
- | This aspect is required for WSRP.
- +-->
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/wsrp"
- default-class="org.apache.cocoon.portal.wsrp.adapter.WSRPEventAspect"/>
-
-
- <!--+
- | Renderer Aspects
- |
- +-->
- <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/wsrp-window"
- default-class="org.apache.cocoon.portal.wsrp.adapter.WSRPPortletWindowAspect"/>
-
- <!--+
- | Default User Context Provider for WSRP.
- +-->
- <role name="org.apache.cocoon.portal.wsrp.consumer.UserContextProvider"
- default-class="org.apache.cocoon.portal.wsrp.consumer.UserContextProviderImpl"/>
-
- <!--+
- | Coplet Adapters
- |
- +-->
- <!--+
- | This is the WSRP coplet adapter.
- +-->
- <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/wsrp"
- default-class="org.apache.cocoon.portal.wsrp.adapter.WSRPAdapter"
- shorthand="wsrp-adapter"/>
-
+<!--
+ 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.
+-->
+<!-- $Id$ -->
+<role-list>
+
+ <!--+
+ | Event Aspects
+ |
+ +-->
+ <!--+
+ | This aspect is required for WSRP.
+ +-->
+ <role name="org.apache.cocoon.portal.event.aspect.EventAspect/wsrp"
+ default-class="org.apache.cocoon.portal.wsrp.adapter.WSRPEventAspect"/>
+
+
+ <!--+
+ | Renderer Aspects
+ |
+ +-->
+ <role name="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect/wsrp-window"
+ default-class="org.apache.cocoon.portal.wsrp.adapter.WSRPPortletWindowAspect"/>
+
+ <!--+
+ | Default User Context Provider for WSRP.
+ +-->
+ <role name="org.apache.cocoon.portal.wsrp.consumer.UserContextProvider"
+ default-class="org.apache.cocoon.portal.wsrp.consumer.UserContextProviderImpl"/>
+
+ <!--+
+ | Coplet Adapters
+ |
+ +-->
+ <!--+
+ | This is the WSRP coplet adapter.
+ +-->
+ <role name="org.apache.cocoon.portal.coplet.adapter.CopletAdapter/wsrp"
+ default-class="org.apache.cocoon.portal.wsrp.adapter.WSRPAdapter"
+ shorthand="wsrp-adapter"/>
+
</role-list>
Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal-wsrp.roles
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/portal-wsrp.roles
------------------------------------------------------------------------------
svn:keywords = Id