Author: taylor
Date: Thu Feb 1 14:22:38 2007
New Revision: 502380
URL: http://svn.apache.org/viewvc?view=rev&rev=502380
Log:
removal of Content Server and ContentServerAdaptor as Content Server is no
longer in use, the adaptor was wasting render cycles
preparing info for the content server no longer required
Removed:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/ContentServerAdapterImpl.java
portals/jetspeed-2/trunk/content-server/
Modified:
portals/jetspeed-2/trunk/.classpath
portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/portals/applications/desktop/WeatherPortlet.java
portals/jetspeed-2/trunk/components/portal/maven.xml
portals/jetspeed-2/trunk/components/portal/pom.xml
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/AsyncPageAggregatorImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java
portals/jetspeed-2/trunk/jetspeed-components.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/Log4j.properties
portals/jetspeed-2/trunk/pom.xml
portals/jetspeed-2/trunk/portal/pom.xml
portals/jetspeed-2/trunk/project.properties
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/aggregation.xml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/Log4j.properties
Modified: portals/jetspeed-2/trunk/.classpath
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/.classpath?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
--- portals/jetspeed-2/trunk/.classpath (original)
+++ portals/jetspeed-2/trunk/.classpath Thu Feb 1 14:22:38 2007
@@ -120,5 +120,6 @@
<classpathentry kind="var"
path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/commons-betwixt/jars/commons-betwixt-20061115.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/ant/jars/ant-1.6.5.jar"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/pluto-1.0.1"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified:
portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/portals/applications/desktop/WeatherPortlet.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/portals/applications/desktop/WeatherPortlet.java?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
---
portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/portals/applications/desktop/WeatherPortlet.java
(original)
+++
portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/portals/applications/desktop/WeatherPortlet.java
Thu Feb 1 14:22:38 2007
@@ -58,7 +58,7 @@
String style = prefs.getValue(WEATHER_STYLE, "infobox");
context.put(WEATHER_STYLE, style);
-
+ response.setProperty("david", "taylor");
super.doView(request, response);
}
Modified: portals/jetspeed-2/trunk/components/portal/maven.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/maven.xml?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/maven.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/maven.xml Thu Feb 1 14:22:38
2007
@@ -17,6 +17,6 @@
<project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define"
xmlns:maven="jelly:maven">
<!-- Target of maven test:single test -->
- <property name='testcase'
value='org.apache.jetspeed.tools.pamanager.TestJetspeedPortletDescriptor' />
+ <property name='testcase'
value='org.apache.jetspeed.tools.pamanager.TestPortletDescriptor' />
</project>
Modified: portals/jetspeed-2/trunk/components/portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/pom.xml?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/pom.xml Thu Feb 1 14:22:38 2007
@@ -55,10 +55,6 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>content-server</artifactId>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-prefs</artifactId>
</dependency>
<dependency>
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/AsyncPageAggregatorImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/AsyncPageAggregatorImpl.java?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/AsyncPageAggregatorImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/AsyncPageAggregatorImpl.java
Thu Feb 1 14:22:38 2007
@@ -16,20 +16,18 @@
package org.apache.jetspeed.aggregator.impl;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.ArrayList;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.PortalReservedParameters;
-import org.apache.jetspeed.aggregator.ContentDispatcher;
-import org.apache.jetspeed.aggregator.ContentServerAdapter;
import org.apache.jetspeed.aggregator.FailedToRenderFragmentException;
import org.apache.jetspeed.aggregator.PageAggregator;
+import org.apache.jetspeed.aggregator.PortletContent;
import org.apache.jetspeed.aggregator.PortletRenderer;
import org.apache.jetspeed.aggregator.RenderingJob;
-import org.apache.jetspeed.aggregator.PortletContent;
import org.apache.jetspeed.container.state.NavigationalState;
import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.om.page.ContentFragment;
@@ -51,15 +49,12 @@
protected final static Log log =
LogFactory.getLog(AsyncPageAggregatorImpl.class);
protected PortletRenderer renderer;
- protected ContentServerAdapter contentServer;
protected List fallBackContentPathes;
- public AsyncPageAggregatorImpl(PortletRenderer renderer,
- ContentServerAdapter contentServer)
+ public AsyncPageAggregatorImpl(PortletRenderer renderer)
{
this.renderer = renderer;
- this.contentServer = contentServer;
}
/**
@@ -74,19 +69,11 @@
{
throw new JetspeedException("Failed to find PSML Pin
ContentPageAggregator.build");
}
-
ContentFragment root = page.getRootContentFragment();
-
if (root == null)
{
throw new JetspeedException("No root ContentFragment found in
ContentPage");
}
-
- contentServer.prepareContentPaths(context, page);
-
-
-
///////////////////////////////////////////////////////////////////////////////////////////////
- ContentDispatcher dispatcher = renderer.getDispatcher(context, true);
// handle maximized state
NavigationalState nav = context.getPortalURL().getNavigationalState();
PortletWindow window = nav.getMaximizedWindow();
@@ -97,11 +84,9 @@
else
{
aggregateAndRender(root, context, page, true, null, null);
- }
-
+ }
//dispatcher.include(root);
context.getResponse().getWriter().write(root.getRenderedContent());
-
if (null != window)
{
context.getRequest().removeAttribute(PortalReservedParameters.MAXIMIZED_FRAGMENT_ATTRIBUTE);
@@ -125,38 +110,22 @@
protected void renderMaximizedWindow( RequestContext context, ContentPage
page, ContentFragment layoutContentFragment,
PortletWindow window ) throws FailedToRenderFragmentException
{
- String defaultPortletDecorator =
page.getEffectiveDefaultDecorator(ContentFragment.PORTLET);
ContentFragment maxedContentFragment =
page.getContentFragmentById(window.getId().toString());
if (maxedContentFragment != null)
{
context.getRequest().setAttribute(PortalReservedParameters.MAXIMIZED_FRAGMENT_ATTRIBUTE,
maxedContentFragment);
context.getRequest().setAttribute(PortalReservedParameters.FRAGMENT_ATTRIBUTE,
maxedContentFragment);
context.getRequest().setAttribute(PortalReservedParameters.MAXIMIZED_LAYOUT_ATTRIBUTE,
page.getRootContentFragment());
-
- if (maxedContentFragment.getDecorator() != null)
- {
- log.debug("decorator=" + layoutContentFragment.getDecorator());
- contentServer.addStyle(context,
maxedContentFragment.getDecorator(), ContentFragment.PORTLET);
- }
- else
- {
- log.debug("no decorator for defined for portlet fragement," +
layoutContentFragment.getId()
- + ". So using page default, " +
defaultPortletDecorator);
- contentServer.addStyle(context, defaultPortletDecorator,
ContentFragment.PORTLET);
- }
try
{
renderer.renderNow(maxedContentFragment, context);
- renderer.renderNow(layoutContentFragment, context);
-
+ renderer.renderNow(layoutContentFragment, context);
}
catch (Exception e)
{
log.error(e.getMessage(), e);
maxedContentFragment.overrideRenderedContent("Sorry, but we
were unable access the requested portlet. Send the following message to your
portal admin: "+ e.getMessage());
}
-
-
}
}
@@ -249,22 +218,8 @@
if (log.isDebugEnabled())
{
log.debug("Rendering portlet fragment: [[name, " + f.getName() +
"], [id, " + f.getId() + "]]");
- }
-
+ }
renderer.renderNow(f, context);
-
-
- if (f.getDecorator() != null &&
f.getType().equals(ContentFragment.PORTLET))
- {
- log.debug("decorator=" + f.getDecorator());
- contentServer.addStyle(context, f.getDecorator(),
ContentFragment.PORTLET);
- }
- else if (f.getDecorator() == null &&
f.getType().equals(ContentFragment.PORTLET))
- {
- log.debug("no decorator for defined for portlet fragement," +
f.getId() + ". So using page default, "
- + defaultPortletDecorator);
- contentServer.addStyle(context, defaultPortletDecorator,
ContentFragment.PORTLET);
- }
}
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
Thu Feb 1 14:22:38 2007
@@ -21,8 +21,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.PortalReservedParameters;
-import org.apache.jetspeed.aggregator.ContentDispatcher;
-import org.apache.jetspeed.aggregator.ContentServerAdapter;
import org.apache.jetspeed.aggregator.FailedToRenderFragmentException;
import org.apache.jetspeed.aggregator.PageAggregator;
import org.apache.jetspeed.aggregator.PortletRenderer;
@@ -49,19 +47,17 @@
private int strategy = STRATEGY_SEQUENTIAL;
private PortletRenderer renderer;
- private ContentServerAdapter contentServer;
- public PageAggregatorImpl( PortletRenderer renderer, int strategy,
ContentServerAdapter contentServer)
+ public PageAggregatorImpl( PortletRenderer renderer, int strategy)
{
this.renderer = renderer;
this.strategy = strategy;
- this.contentServer = contentServer;
}
- public PageAggregatorImpl( PortletRenderer renderer, ContentServerAdapter
contentServer)
+ public PageAggregatorImpl( PortletRenderer renderer)
{
- this(renderer, STRATEGY_SEQUENTIAL, contentServer);
+ this(renderer, STRATEGY_SEQUENTIAL);
}
/**
@@ -76,24 +72,11 @@
{
throw new JetspeedException("Failed to find PSML Pin
ContentPageAggregator.build");
}
-
ContentFragment root = page.getRootContentFragment();
-
if (root == null)
{
throw new JetspeedException("No root ContentFragment found in
ContentPage");
}
-
- String layoutDecorator = root.getDecorator();
- if (layoutDecorator == null)
- {
- layoutDecorator =
page.getEffectiveDefaultDecorator(root.getType());
- }
-
- contentServer.prepareContentPaths(context, page);
-
-
///////////////////////////////////////////////////////////////////////////////////////////////
- ContentDispatcher dispatcher = renderer.getDispatcher(context,
(strategy == STRATEGY_PARALLEL));
// handle maximized state
NavigationalState nav = context.getPortalURL().getNavigationalState();
PortletWindow window = nav.getMaximizedWindow();
@@ -104,11 +87,8 @@
else
{
aggregateAndRender(root, context, page);
- }
-
- //dispatcher.include(root);
+ }
context.getResponse().getWriter().write(root.getRenderedContent());
-
if (null != window)
{
context.getRequest().removeAttribute(PortalReservedParameters.MAXIMIZED_FRAGMENT_ATTRIBUTE);
@@ -132,7 +112,6 @@
protected void renderMaximizedWindow( RequestContext context, ContentPage
page, ContentFragment layoutContentFragment,
PortletWindow window ) throws FailedToRenderFragmentException
{
- String defaultPortletDecorator =
page.getEffectiveDefaultDecorator(ContentFragment.PORTLET);
ContentFragment maxedContentFragment =
page.getContentFragmentById(window.getId().toString());
if (maxedContentFragment != null)
{
@@ -140,17 +119,6 @@
context.getRequest().setAttribute(PortalReservedParameters.FRAGMENT_ATTRIBUTE,
maxedContentFragment);
context.getRequest().setAttribute(PortalReservedParameters.MAXIMIZED_LAYOUT_ATTRIBUTE,
page.getRootContentFragment());
- if (maxedContentFragment.getDecorator() != null)
- {
- log.debug("decorator=" + layoutContentFragment.getDecorator());
- contentServer.addStyle(context,
maxedContentFragment.getDecorator(), ContentFragment.PORTLET);
- }
- else
- {
- log.debug("no decorator for defined for portlet fragement," +
layoutContentFragment.getId()
- + ". So using page default, " +
defaultPortletDecorator);
- contentServer.addStyle(context, defaultPortletDecorator,
ContentFragment.PORTLET);
- }
try
{
renderer.renderNow(maxedContentFragment, context);
@@ -174,7 +142,6 @@
protected void aggregateAndRender( ContentFragment f, RequestContext
context, ContentPage page )
throws FailedToRenderFragmentException
{
-
if (f.getContentFragments() != null && f.getContentFragments().size()
> 0)
{
Iterator children = f.getContentFragments().iterator();
@@ -187,17 +154,6 @@
}
}
}
-
- // Start the actual rendering process
- String defaultPortletDecorator =
page.getEffectiveDefaultDecorator(ContentFragment.PORTLET);
- if (log.isDebugEnabled())
- {
- log.debug("Rendering portlet fragment: [[name, " + f.getName() +
"], [id, " + f.getId() + "]]");
- }
-
-
-
-
if (strategy == STRATEGY_SEQUENTIAL)
{
renderer.renderNow(f, context);
@@ -205,18 +161,6 @@
else
{
renderer.render(f, context);
- }
-
- if (f.getDecorator() != null &&
f.getType().equals(ContentFragment.PORTLET))
- {
- log.debug("decorator=" + f.getDecorator());
- contentServer.addStyle(context, f.getDecorator(),
ContentFragment.PORTLET);
- }
- else if (f.getDecorator() == null &&
f.getType().equals(ContentFragment.PORTLET))
- {
- log.debug("no decorator for defined for portlet fragement," +
f.getId() + ". So using page default, "
- + defaultPortletDecorator);
- contentServer.addStyle(context, defaultPortletDecorator,
ContentFragment.PORTLET);
}
}
}
Modified:
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
---
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java
(original)
+++
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java
Thu Feb 1 14:22:38 2007
@@ -111,17 +111,17 @@
}
else
{
- if (log.isDebugEnabled())
- {
- log.debug("Implying permission [class, " +
permission.getClass().getName() + "], " + "[name, "
- + permission.getName() + "], " + "[actions, " +
permission.getActions() + "] for: ");
- log.debug("\tCodeSource:" +
protectionDomain.getCodeSource().getLocation().getPath());
- for (int i = 0; i < principals.length; i++)
- {
- log.debug("\tPrincipal[" + i + "]: [name, " +
principals[i].getName() + "], [class, "
- + principals[i].getClass() + "]");
- }
- }
+// if (log.isDebugEnabled())
+// {
+// log.debug("Implying permission [class, " +
permission.getClass().getName() + "], " + "[name, "
+// + permission.getName() + "], " + "[actions, " +
permission.getActions() + "] for: ");
+// log.debug("\tCodeSource:" +
protectionDomain.getCodeSource().getLocation().getPath());
+// for (int i = 0; i < principals.length; i++)
+// {
+// log.debug("\tPrincipal[" + i + "]: [name, " +
principals[i].getName() + "], [class, "
+// + principals[i].getClass() + "]");
+// }
+// }
perms = pms.getPermissions(Arrays.asList(principals));
}
}
@@ -162,10 +162,10 @@
*/
public PermissionCollection getPermissions(CodeSource codeSource)
{
- if (log.isDebugEnabled())
- {
- log.debug("getPermissions called for '" + codeSource + "'.");
- }
+// if (log.isDebugEnabled())
+// {
+// log.debug("getPermissions called for '" + codeSource + "'.");
+// }
PermissionCollection otherPerms =
getOtherPoliciesPermissions(codeSource);
return otherPerms;
@@ -181,10 +181,10 @@
*/
private PermissionCollection getOtherPoliciesPermissions(CodeSource
codeSource)
{
- if (log.isDebugEnabled())
- {
- log.debug("Checking other policies permissions.");
- }
+// if (log.isDebugEnabled())
+// {
+// log.debug("Checking other policies permissions.");
+// }
log.debug("CodeSource: " + codeSource.getLocation().getPath());
List securityPolicies =
SecurityPolicies.getInstance().getUsedPolicies();
Modified: portals/jetspeed-2/trunk/jetspeed-components.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-components.xml?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-components.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-components.xml Thu Feb 1 14:22:38 2007
@@ -30,16 +30,6 @@
</properties>
</dependency>
<dependency>
- <id>content-server</id>
- <groupId>org.apache.portals.jetspeed-2</groupId>
- <version>
- ${jetspeed.version}
- </version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
<id>jetspeed-components</id>
<groupId>org.apache.portals.jetspeed-2</groupId>
<version>
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
Thu Feb 1 14:22:38 2007
@@ -240,11 +240,6 @@
</dependency>
<dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>content-server</artifactId>
- <version>${org.apache.portals.jetspeed-2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-cm</artifactId>
<version>${org.apache.portals.jetspeed-2.version}</version>
</dependency>
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
Thu Feb 1 14:22:38 2007
@@ -132,11 +132,6 @@
<!-- Runtime Dependencies -->
<dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>content-server</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-cm</artifactId>
<scope>runtime</scope>
</dependency>
Modified:
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/Log4j.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/Log4j.properties?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
---
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/Log4j.properties
(original)
+++
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/src/webapp/WEB-INF/conf/Log4j.properties
Thu Feb 1 14:22:38 2007
@@ -83,11 +83,6 @@
log4j.category.console = INFO, console
log4j.additivity.console = false
-#
-# Content Server
-#
-log4j.category.org.apache.jetspeed.contentserver = WARN, CONTENT_SERVER
-log4j.additivity.org.apache.struts = false
########################################################################
#
@@ -163,11 +158,3 @@
# Pattern to output the caller's file name and line number.
log4j.appender.console.layout.ConversionPattern=%5p: %m%n
-#
-# content-server.log
-#
-log4j.appender.CONTENT_SERVER = org.apache.log4j.FileAppender
-log4j.appender.CONTENT_SERVER.file = ${applicationRoot}/logs/content-server.log
-log4j.appender.CONTENT_SERVER.layout = org.apache.log4j.PatternLayout
-log4j.appender.CONTENT_SERVER.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.CONTENT_SERVER.append = false
Modified: portals/jetspeed-2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/pom.xml?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Thu Feb 1 14:22:38 2007
@@ -216,7 +216,6 @@
<!-- Base Modules -->
<module>commons</module>
<module>jetspeed-api</module>
- <module>content-server</module>
<!-- J2 Database -->
<module>etc</module>
@@ -317,11 +316,6 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-commons</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>content-server</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
Modified: portals/jetspeed-2/trunk/portal/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/portal/pom.xml?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
--- portals/jetspeed-2/trunk/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/portal/pom.xml Thu Feb 1 14:22:38 2007
@@ -118,11 +118,6 @@
<!-- Runtime Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>content-server</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>jetspeed-cm</artifactId>
<scope>runtime</scope>
</dependency>
Modified: portals/jetspeed-2/trunk/project.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/project.properties?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Thu Feb 1 14:22:38 2007
@@ -96,7 +96,7 @@
maven.multiproject.aggregateDir=multiproject/
maven.multiproject.ignoreFailures=false
-jar.includes=ant-tasks/project.xml,applications/gems/project.xml,applications/rss/project.xml,portlet-api/project.xml,commons/project.xml,cps/project.xml,content-server/project.xml,jetspeed-api/project.xml,components/**/project.xml,taglibs/treecontrol/project.xml,layout-portlets/project.xml
+jar.includes=ant-tasks/project.xml,applications/gems/project.xml,applications/rss/project.xml,portlet-api/project.xml,commons/project.xml,cps/project.xml,jetspeed-api/project.xml,components/**/project.xml,taglibs/treecontrol/project.xml,layout-portlets/project.xml
jar.excludes=/project.xml,maven-plugin/**,applications/project.xml,applications/demo/**,applications/j2-admin/**,site/project.xml,design-docs/project.xml
maven.multiproject.site.goals=site pdf dashboard:report-single
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/aggregation.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/aggregation.xml?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/aggregation.xml
(original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/aggregation.xml Thu
Feb 1 14:22:38 2007
@@ -97,9 +97,6 @@
<constructor-arg index="1">
<value>0</value>
</constructor-arg>
- <constructor-arg index='2'>
- <ref bean="org.apache.jetspeed.aggregator.ContentServerAdapter" />
- </constructor-arg>
</bean>
<!-- REFACTORING: this bean is not currently used, experimental -->
@@ -110,24 +107,6 @@
<constructor-arg index='0'>
<ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
</constructor-arg>
- <constructor-arg index='1'>
- <ref bean="org.apache.jetspeed.aggregator.ContentServerAdapter" />
- </constructor-arg>
- </bean>
-
- <bean id="org.apache.jetspeed.aggregator.ContentServerAdapter"
- class="org.apache.jetspeed.aggregator.impl.ContentServerAdapterImpl">
- <constructor-arg index="0">
- <ref
bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
- </constructor-arg>
- <constructor-arg index="1">
- <list>
- <value>portlet/{mediaType}</value>
- <value>layout/{mediaType}</value>
- <value>generic/{mediaType}</value>
- <value>{mediaType}</value>
- </list>
- </constructor-arg>
</bean>
<bean id="org.apache.jetspeed.aggregator.WorkerMonitor"
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/Log4j.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/Log4j.properties?view=diff&rev=502380&r1=502379&r2=502380
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/Log4j.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/Log4j.properties Thu Feb
1 14:22:38 2007
@@ -77,12 +77,6 @@
log4j.category.console = INFO, console
log4j.additivity.console = false
-#
-# Content Server
-#
-log4j.category.org.apache.jetspeed.contentserver = WARN, CONTENT_SERVER
-log4j.additivity.org.apache.struts = false
-
########################################################################
#
# Logfile definitions
@@ -157,11 +151,3 @@
# Pattern to output the caller's file name and line number.
log4j.appender.console.layout.ConversionPattern=%5p: %m%n
-#
-# content-server.log
-#
-log4j.appender.CONTENT_SERVER = org.apache.log4j.FileAppender
-log4j.appender.CONTENT_SERVER.file = ${applicationRoot}/logs/content-server.log
-log4j.appender.CONTENT_SERVER.layout = org.apache.log4j.PatternLayout
-log4j.appender.CONTENT_SERVER.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.CONTENT_SERVER.append = false
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
