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 wo...@apache.org on 2009/09/17 12:31:56 UTC
svn commit: r816130 - in /portals/jetspeed-2/portal/trunk: ./
applications/jetspeed-dependencies/
applications/jetspeed/src/main/webapp/WEB-INF/
applications/jetspeed/src/main/webapp/WEB-INF/pages/ components/
components/jetspeed-db-tools/ components/j...
Author: woonsan
Date: Thu Sep 17 10:31:55 2009
New Revision: 816130
URL: http://svn.apache.org/viewvc?rev=816130&view=rev
Log:
JS2-1063: Reverting jetspeed-proxy module and its configurations because the module has been moved to apa-webcontent. (See APA-16).
Also, replaces an example portlet fragment with IFramePortlet in default-page.psml by new ReverseProxyIFramePortlet.
Removed:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/pipeline/valve/impl/WebContentProxyingValveImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-proxy/
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/proxy/
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/webcontent-proxy.xml
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml
portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
portals/jetspeed-2/portal/trunk/components/pom.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml?rev=816130&r1=816129&r2=816130&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-dependencies/pom.xml Thu Sep 17 10:31:55 2009
@@ -65,10 +65,6 @@
</dependency>
<dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-proxy</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-id-generator</artifactId>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml?rev=816130&r1=816129&r2=816130&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml Thu Sep 17 10:31:55 2009
@@ -59,7 +59,7 @@
<property layout="TwoColumns" name="row" value="2" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
- <fragment id="dp-9" type="portlet" name="webcontent::IFramePortlet" decorator="gray-gradient-noborder">
+ <fragment id="dp-9" type="portlet" name="webcontent::ReverseProxyIFramePortlet" decorator="gray-gradient-noborder">
<property layout="TwoColumns" name="row" value="3" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
@@ -67,7 +67,7 @@
<property layout="TwoColumns" name="row" value="4" />
<property layout="TwoColumns" name="column" value="0" />
<preference name="SRC">
- <value>http://www.apache.org</value>
+ <value>http://www.apache.org/</value>
</preference>
</fragment>
<fragment id="dp-17" type="portlet" name="demo::UserInfoTest">
Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml?rev=816130&r1=816129&r2=816130&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/web.xml Thu Sep 17 10:31:55 2009
@@ -202,10 +202,6 @@
<servlet-name>jetspeed</servlet-name>
<url-pattern>/healthcheck/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>jetspeed</servlet-name>
- <url-pattern>/webcontent/*</url-pattern>
- </servlet-mapping>
<!-- Map *.vm files to Velocity -->
<servlet-mapping>
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml?rev=816130&r1=816129&r2=816130&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-db-tools/pom.xml Thu Sep 17 10:31:55 2009
@@ -100,10 +100,6 @@
</dependency>
<dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-proxy</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-id-generator</artifactId>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/pom.xml?rev=816130&r1=816129&r2=816130&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/pom.xml Thu Sep 17 10:31:55 2009
@@ -50,7 +50,6 @@
<module>jetspeed-profiler</module>
<module>jetspeed-rdbms</module>
<module>jetspeed-registry</module>
- <module>jetspeed-proxy</module>
<module>jetspeed-search</module>
<module>jetspeed-security</module>
<module>jetspeed-serializer</module>
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=816130&r1=816129&r2=816130&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml Thu Sep 17 10:31:55 2009
@@ -429,14 +429,6 @@
</constructor-arg>
</bean>
- <bean id="webContentProxyingValve"
- class="org.apache.jetspeed.pipeline.valve.impl.WebContentProxyingValveImpl">
- <meta key="j2:cat" value="default" />
- <constructor-arg index="0">
- <ref bean="webContentProxyService" />
- </constructor-arg>
- </bean>
-
<bean id="portletApplicationValidator"
class="org.apache.jetspeed.healthcheck.validators.PortletApplicationAvailableHeathCheckValidator">
<meta key="j2:cat" value="default" />
@@ -782,18 +774,6 @@
</constructor-arg>
</bean>
- <bean id="webcontent-pipeline" class="org.apache.jetspeed.pipeline.JetspeedPipeline" init-method="initialize">
- <meta key="j2:cat" value="default" />
- <constructor-arg>
- <value>WebContentPipeline</value>
- </constructor-arg>
- <constructor-arg>
- <list>
- <ref bean="webContentProxyingValve" />
- </list>
- </constructor-arg>
- </bean>
-
<bean id='pipeline-map' class='java.util.HashMap'>
<meta key="j2:cat" value="default" />
<constructor-arg>
@@ -839,9 +819,6 @@
<entry key='/healthcheck'>
<value>healthcheck-pipeline</value>
</entry>
- <entry key='/webcontent'>
- <value>webcontent-pipeline</value>
- </entry>
</map>
</constructor-arg>
</bean>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=816130&r1=816129&r2=816130&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Thu Sep 17 10:31:55 2009
@@ -406,11 +406,6 @@
</dependency>
<dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
- <artifactId>jetspeed-proxy</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-id-generator</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -487,11 +482,6 @@
<version>${org.apache.portals.applications.apa-gems.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.portals.applications</groupId>
- <artifactId>apa-webcontent-jar</artifactId>
- <version>${org.apache.portals.applications.apa-webcontent.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-layout-portlets</artifactId>
<version>${pom.version}</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org