Author: rwatler
Date: Fri May 22 18:27:09 2009
New Revision: 777647
URL: http://svn.apache.org/viewvc?rev=777647&view=rev
Log:
configure wps.xml assembly for Websphere enterprise builds
Added:
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/webapp/WEB-INF/assembly/
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/webapp/WEB-INF/assembly/wps.xml
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/webapp/WEB-INF/assembly/
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/webapp/WEB-INF/assembly/wps.xml
Modified:
portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml
portals/jetspeed-2/portal/trunk/enterprise/ear-min/build.xml
Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml?rev=777647&r1=777646&r2=777647&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml Fri May 22
18:27:09 2009
@@ -34,6 +34,7 @@
<antcall target="configurePSML" inheritall="true"/>
<antcall target="configureWEBXML" inheritall="true"/>
<antcall target="configureDBPM" inheritall="true"/>
+ <antcall target="configureAssembly" inheritall="true"/>
<!-- reassemble jetspeed-demo portal application -->
<delete
file="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war"/>
<zip
destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war"
basedir="${project.build.directory}/package-skinny-wars/websphere"/>
@@ -164,4 +165,9 @@
</condition>
</target>
+ <!-- overlay assemblies: enable Websphere PortalRequestFactory -->
+ <target name="configureAssembly">
+ <copy file="${basedir}/src/main/webapp/WEB-INF/assembly/wps.xml"
todir="${project.build.directory}/package-skinny-wars/websphere/WEB-INF/assembly"
overwrite="true"/>
+ </target>
+
</project>
Added:
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/webapp/WEB-INF/assembly/wps.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/webapp/WEB-INF/assembly/wps.xml?rev=777647&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/webapp/WEB-INF/assembly/wps.xml
(added)
+++
portals/jetspeed-2/portal/trunk/enterprise/ear-full/src/main/webapp/WEB-INF/assembly/wps.xml
Fri May 22 18:27:09 2009
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd";>
+
+ <!-- required for websphere, uncomment if running under websphere
+ see: http://issues.apache.org/jira/browse/JS2-355
+ -->
+ <bean id="org.apache.jetspeed.request.PortalRequestFactory"
class="org.apache.jetspeed.request.PortalRequestFactoryImpl"/>
+
+</beans>
Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-min/build.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/build.xml?rev=777647&r1=777646&r2=777647&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-min/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-min/build.xml Fri May 22
18:27:09 2009
@@ -35,6 +35,7 @@
<antcall target="configurePSML" inheritall="true"/>
<antcall target="configureWEBXML" inheritall="true"/>
<antcall target="configureDBPM" inheritall="true"/>
+ <antcall target="configureAssembly" inheritall="true"/>
<!-- reassemble jetspeed-demo portal application -->
<delete
file="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war"/>
<zip
destfile="${project.build.directory}/package-skinny-wars/jetspeed-demo-${pom.version}.war"
basedir="${project.build.directory}/package-skinny-wars/websphere"/>
@@ -129,4 +130,9 @@
</condition>
</target>
+ <!-- overlay assemblies: enable Websphere PortalRequestFactory -->
+ <target name="configureAssembly">
+ <copy file="${basedir}/src/main/webapp/WEB-INF/assembly/wps.xml"
todir="${project.build.directory}/package-skinny-wars/websphere/WEB-INF/assembly"
overwrite="true"/>
+ </target>
+
</project>
Added:
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/webapp/WEB-INF/assembly/wps.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/webapp/WEB-INF/assembly/wps.xml?rev=777647&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/webapp/WEB-INF/assembly/wps.xml
(added)
+++
portals/jetspeed-2/portal/trunk/enterprise/ear-min/src/main/webapp/WEB-INF/assembly/wps.xml
Fri May 22 18:27:09 2009
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd";>
+
+ <!-- required for websphere, uncomment if running under websphere
+ see: http://issues.apache.org/jira/browse/JS2-355
+ -->
+ <bean id="org.apache.jetspeed.request.PortalRequestFactory"
class="org.apache.jetspeed.request.PortalRequestFactoryImpl"/>
+
+</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
