You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2008/03/27 01:24:20 UTC
svn commit: r641656 - in /portals/jetspeed-2/portal/trunk:
applications/jetspeed/
components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/
components/jetspeed-serializer/
components/jetspeed-serializer/src/main/java/org/apache/jetspee...
Author: ate
Date: Wed Mar 26 17:24:18 2008
New Revision: 641656
URL: http://svn.apache.org/viewvc?rev=641656&view=rev
Log:
Adding/fixing JetspeedRegistrySerializer
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java
portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml?rev=641656&r1=641655&r2=641656&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml Wed Mar 26 17:24:18 2008
@@ -144,11 +144,6 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <!-- the portal already includes the full spring -->
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
<!-- brought in by ddlutils -->
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java?rev=641656&r1=641655&r2=641656&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java Wed Mar 26 17:24:18 2008
@@ -58,6 +58,20 @@
protected PortletRegistry registry;
protected SearchEngine searchEngine;
+
+ /**
+ * @param registry
+ * @param entityAccess
+ * @param searchEngine
+ */
+ public JetspeedRegistrySerializer(PortletRegistry registry, PortletEntityAccessComponent entityAccess,
+ SearchEngine searchEngine)
+ {
+ this.registry = registry;
+ this.entityAccess = entityAccess;
+ this.searchEngine = searchEngine;
+ }
+
/*
* (non-Javadoc)
*
@@ -181,7 +195,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error(e);
}
}
// check preferences
@@ -192,36 +206,37 @@
private void importEntityPref(JSEntity entity, MutablePortletEntity portletEntity, Map settings, Log log)
{
+ if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_PREFERENCES) && isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES))
+ {
+ // do I carry any preferences?
+ JSEntityPreferences preferences = entity.getEntityPreferences();
+ if ((preferences == null) || (preferences.size() == 0))
+ return;
- // do I carry any preferences?
- JSEntityPreferences preferences = entity.getEntityPreferences();
- if ((preferences == null) || (preferences.size() == 0))
- return;
+ // since I do have preferences let us make sure we have a root node
- // since I do have preferences let us make sure we have a root node
+ String rootForEntity = MutablePortletEntity.PORTLET_ENTITY_ROOT + "/" + portletEntity.getId();
+ try
+ {
+ Preferences.userRoot().node(rootForEntity); // will create it if it
+ // doesn't exist
- String rootForEntity = MutablePortletEntity.PORTLET_ENTITY_ROOT + "/" + portletEntity.getId();
- try
- {
- Preferences.userRoot().node(rootForEntity); // will create it if it
- // doesn't exist
+ Iterator it = preferences.iterator();
+ while (it.hasNext())
+ {
+ JSEntityPreference preference = (JSEntityPreference) it.next();
- Iterator it = preferences.iterator();
- while (it.hasNext())
- {
- JSEntityPreference preference = (JSEntityPreference) it.next();
+ // do we have preferences for this one?
+ importPreferenceNode(preference, portletEntity, settings, log);
+ }
- // do we have preferences for this one?
- importPreferenceNode(preference, portletEntity, settings, log);
}
-
- }
- catch (Exception e)
- {
- e.printStackTrace();
- return;
+ catch (Exception e)
+ {
+ log.error(e);
+ return;
+ }
}
-
}
private void importPreferenceNode(JSEntityPreference preference, MutablePortletEntity entity, Map settings, Log log)
@@ -262,7 +277,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error(e);
return;
}
@@ -291,7 +306,7 @@
MutablePortletApplication pa = (MutablePortletApplication) list.next();
// PortletApplicationDefinition pa =
// (PortletApplicationDefinition)list.next();
- snapshot.getApplications().add(exportPA(pa));
+ snapshot.getApplications().add(exportPA(pa, settings, log));
}
catch (Exception e)
{
@@ -301,11 +316,11 @@
}
}
- private JSApplication exportPA(MutablePortletApplication pa) throws SerializerException
+ private JSApplication exportPA(MutablePortletApplication pa, Map settings, Log log) throws SerializerException
{
JSApplication app = new JSApplication();
- System.out.println("--processed PA " + pa.getName() + " with id=" + pa.getId());
+ log.debug("--processed PA " + pa.getName() + " with id=" + pa.getId());
app.setID(pa.getId().toString());
app.setName(pa.getName());
/**
@@ -322,14 +337,14 @@
try
{
pd = (PortletDefinition) pi.next();
- JSPortlet p = exportPD(pd);
+ JSPortlet p = exportPD(pd, settings, log);
if (p != null)
{
- System.out.println("--processed PA " + pa.getName() + " with pd=" + pd.getName());
+ log.debug("--processed PA " + pa.getName() + " with pd=" + pd.getName());
portlets.add(p);
}
else
- System.out.println("--processed PA " + pa.getName() + " with NULL pd=" + pd.getName());
+ log.debug("--processed PA " + pa.getName() + " with NULL pd=" + pd.getName());
}
catch (Exception e)
@@ -342,7 +357,7 @@
return app;
}
- private JSPortlet exportPD(PortletDefinition pd) throws SerializerException
+ private JSPortlet exportPD(PortletDefinition pd, Map settings, Log log) throws SerializerException
{
try
@@ -367,12 +382,12 @@
while (list.hasNext())
{
MutablePortletEntity entity = (MutablePortletEntity) list.next();
- JSEntity jsEntity = exportEntityPref(entity);
+ JSEntity jsEntity = exportEntityPref(entity, settings, log);
if (jsEntity != null)
entities.add(jsEntity);
}
- System.out.println("-----processedAnyEntities for PD=" + pd.getName());
+ log.debug("-----processedAnyEntities for PD=" + pd.getName());
portlet.setEntities(entities);
return portlet;
@@ -384,48 +399,46 @@
}
}
- JSEntity exportEntityPref(MutablePortletEntity entity)
+ JSEntity exportEntityPref(MutablePortletEntity entity, Map settings, Log log)
{
- JSEntity jsEntity = new JSEntity();
- jsEntity.setId(entity.getId().toString());
- String rootForEntity = MutablePortletEntity.PORTLET_ENTITY_ROOT + "/" + entity.getId();
- try
+ JSEntity jsEntity = null;
+
+ if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_PREFERENCES) && isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES))
{
- if (!(Preferences.userRoot().nodeExists(rootForEntity)))
- {
- // System.out.println("No preferences exist for entity "+
- // entity.getId());
- return jsEntity;
- }
-
- Preferences prefNode = Preferences.userRoot().node(rootForEntity);
- String[] children = prefNode.childrenNames();
- if ((children != null) && (children.length > 0))
+ String rootForEntity = MutablePortletEntity.PORTLET_ENTITY_ROOT + "/" + entity.getId();
+ try
{
- JSEntityPreferences permissions = new JSEntityPreferences();
-
- for (int i = 0; i < children.length; i++)
+ if (Preferences.userRoot().nodeExists(rootForEntity))
{
- JSEntityPreference permission = exportPreferenceNode(entity, children[i]);
- if (permission != null)
- permissions.add(permission);
+ Preferences prefNode = Preferences.userRoot().node(rootForEntity);
+ String[] children = prefNode.childrenNames();
+ if ((children != null) && (children.length > 0))
+ {
+ jsEntity = new JSEntity();
+ jsEntity.setId(entity.getId().toString());
+ JSEntityPreferences permissions = new JSEntityPreferences();
+
+ for (int i = 0; i < children.length; i++)
+ {
+ JSEntityPreference permission = exportPreferenceNode(entity, children[i], settings, log);
+ if (permission != null)
+ permissions.add(permission);
+ }
+ log.debug("processed preferences for entity=" + entity.getId());
+ jsEntity.setEntityPreferences(permissions);
+ }
}
- System.out.println("processed preferences for entity=" + entity.getId());
- jsEntity.setEntityPreferences(permissions);
- return jsEntity;
- // processPreferenceNode(entity,prefNode,null);
}
- return jsEntity;
- }
- catch (Exception e)
- {
- e.printStackTrace();
- return null;
+ catch (Exception e)
+ {
+ log.error(e);
+ jsEntity = null;
+ }
}
-
+ return jsEntity;
}
- JSEntityPreference exportPreferenceNode(MutablePortletEntity entity, String child)
+ JSEntityPreference exportPreferenceNode(MutablePortletEntity entity, String child, Map settings, Log log)
{
String prefNodePath = MutablePortletEntity.PORTLET_ENTITY_ROOT + "/" + entity.getId() + "/" + child + "/"
+ PrefsPreference.PORTLET_PREFERENCES_ROOT;
@@ -433,8 +446,8 @@
if (prefNode == null)
return null;
- JSEntityPreference permission = new JSEntityPreference();
- permission.setName(child);
+ JSEntityPreference preference = new JSEntityPreference();
+ preference.setName(child);
try
{
@@ -457,17 +470,15 @@
}
if (v.size() > 0)
{
- permission.setPreferences(v);
- return permission;
+ preference.setPreferences(v);
+ return preference;
}
return null;
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error(e);
return null;
-
}
-
}
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml?rev=641656&r1=641655&r2=641656&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml Wed Mar 26 17:24:18 2008
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
+ <artifactId>spring</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java?rev=641656&r1=641655&r2=641656&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java Wed Mar 26 17:24:18 2008
@@ -27,7 +27,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.components.ComponentManager;
import org.apache.jetspeed.serializer.objects.JSApplication;
import org.apache.jetspeed.serializer.objects.JSApplications;
import org.apache.jetspeed.serializer.objects.JSCapabilities;
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml?rev=641656&r1=641655&r2=641656&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml Wed Mar 26 17:24:18 2008
@@ -127,7 +127,7 @@
<ref bean="org.apache.jetspeed.audit.AuditActivity"/>
</entry>
<entry key="JetspeedSerializer">
- <ref bean="JetspeedSerializer"/>
+ <ref bean="org.apache.jetspeed.serializer.JetspeedSerializer"/>
</entry>
<!-- first uncomment the below service bean in security-spi-atn.xml
<entry key="PasswordEncodingService">
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml?rev=641656&r1=641655&r2=641656&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml Wed Mar 26 17:24:18 2008
@@ -3,7 +3,7 @@
<beans>
- <bean id="JetspeedSerializer" class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
+ <bean id="org.apache.jetspeed.serializer.JetspeedSerializer" name="JetspeedSerializer" class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
<constructor-arg index="0">
<list>
<bean class="org.apache.jetspeed.serializer.JetspeedCapabilitiesSerializer">
@@ -20,6 +20,11 @@
<constructor-arg index="0" ref="org.apache.jetspeed.profiler.Profiler" />
<constructor-arg index="1" ref="org.apache.jetspeed.security.UserManager" />
</bean>
+ <bean class="org.apache.jetspeed.serializer.JetspeedRegistrySerializer">
+ <constructor-arg index="0" ref="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+ <constructor-arg index="1" ref="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" />
+ <constructor-arg index="2" ref="org.apache.jetspeed.search.SearchEngine"</constructor-arg>
+ </bean>
</list>
</constructor-arg>
<constructor-arg index="1">
@@ -33,17 +38,17 @@
<entry key="process_profiler">
<value type="java.lang.Boolean">true</value>
</entry>
- <!-- following serializers are not yet implemented/available -->
- <entry key="process_user_preferences">
- <value type="java.lang.Boolean">false</value>
- </entry>
- <entry key="process_portal_preferences">
- <value type="java.lang.Boolean">false</value>
- </entry>
<entry key="process_entities">
- <value type="java.lang.Boolean">false</value>
+ <value type="java.lang.Boolean">true</value>
</entry>
<entry key="process_preferences">
+ <value type="java.lang.Boolean">true</value>
+ </entry>
+ <entry key="process_user_preferences">
+ <value type="java.lang.Boolean">true</value>
+ </entry>
+ <!-- following serializers are not yet implemented/available -->
+ <entry key="process_portal_preferences">
<value type="java.lang.Boolean">false</value>
</entry>
</map>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org