portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r505014 [11/11] - in /portals/jetspeed-2/trunk: components/serializer/ components/serializer/src/java/org/apache/jetspeed/serializer/ components/serializer/src/java/org/apache/jetspeed/serializer/objects/ etc/ etc/sql/ etc/xsd/ jetspeed-api...
Date Thu, 08 Feb 2007 19:31:03 GMT
Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?view=diff&rev=505014&r1=505013&r2=505014
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Thu Feb  8 11:31:01 2007
@@ -1101,11 +1101,18 @@
         <include name="security*.xml"/>
 		<include name="capabilities.xml"/>           
 		<include name="prefs.xml"/>           
-		<include name="profiler.xml"/>           
+		<include name="profiler.xml"/>      
+		<include name="registry.xml"/>       
 		<include name="transaction.xml"/>           
       </fileset>
      </copy>
 
+	<copy todir="${temp.assembly.dir}" overwrite="true" failonerror="true">
+      <fileset dir="${portal.webapp.dir.assembly}/alternate/">
+        <include name="request-context.xml"/>
+      </fileset>
+     </copy>
+
     <mkdir dir="${temp.assembly.dir}/boot"/>
 
 	<copy todir="${temp.assembly.dir}/boot" overwrite="true" failonerror="true">
@@ -1115,7 +1122,6 @@
     </copy>
 
 	<echo> running _db.seed with data: ${DATAFILE}  arguments: -b ${temp.assembly.dir}/boot/
-c ${temp.assembly.dir}/  database-url: ${org.apache.jetspeed.database.url}</echo>
-    	
     <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes">
       <classpath>
         <path refid="maven.dependency.classpath"/>

Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/request-context.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/request-context.xml?view=auto&rev=505014
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/request-context.xml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/request-context.xml Thu
Feb  8 11:31:01 2007
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    Copyright 2004 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.
+-->
+<beans>
+
+    <!-- Request Context -->
+    <bean id="org.apache.jetspeed.request.RequestContextComponent" class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
+        <constructor-arg>
+            <value>org.apache.jetspeed.request.JetspeedRequestContext</value>
+        </constructor-arg>
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.userinfo.UserInfoManager" />
+        </constructor-arg>
+    </bean>
+	<!-- Single Source User Info -->
+  <bean id="org.apache.jetspeed.userinfo.UserInfoManager" 
+  	   class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
+  >
+     <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
 	     	   
+     <constructor-arg index="1"><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
+  </bean>
+
+
+</beans>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message