incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r365482 - in /incubator/graffito/trunk/jetspeed2-deploy: ./ src/assembly/ src/decorations/ src/java/org/apache/portals/jetspeed/valve/
Date Tue, 03 Jan 2006 00:02:07 GMT
Author: clombart
Date: Mon Jan  2 16:01:59 2006
New Revision: 365482

URL: http://svn.apache.org/viewcvs?rev=365482&view=rev
Log:
Use the last j2 dependencies

Removed:
    incubator/graffito/trunk/jetspeed2-deploy/src/decorations/
Modified:
    incubator/graffito/trunk/jetspeed2-deploy/.classpath
    incubator/graffito/trunk/jetspeed2-deploy/maven.xml
    incubator/graffito/trunk/jetspeed2-deploy/project.xml
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-services.xml
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml
    incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml
    incubator/graffito/trunk/jetspeed2-deploy/src/java/org/apache/portals/jetspeed/valve/GraffitoContextValve.java

Modified: incubator/graffito/trunk/jetspeed2-deploy/.classpath
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/.classpath?rev=365482&r1=365481&r2=365482&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/.classpath (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/.classpath Mon Jan  2 16:01:59 2006
@@ -5,17 +5,17 @@
   </classpathentry>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-2.0-M3.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.jetspeed-2/jars/jetspeed-portal-2.0.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-api-2.0-M3.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.jetspeed-2/jars/jetspeed-api-2.0.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-components-2.0-M3.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.jetspeed-2/jars/jetspeed-components-2.0.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/graffito/jars/graffito-commons-1.0-a1-dev.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.graffito/jars/graffito-commons-1.0-a1-dev.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/graffito/jars/graffito-api-1.0-a1-dev.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.graffito/jars/graffito-api-1.0-a1-dev.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/graffito/jars/graffito-components-1.0-a1-dev.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.graffito/jars/graffito-components-1.0-a1-dev.jar">
   </classpathentry>
   <classpathentry kind="output" path="target/classes">
   </classpathentry>

Modified: incubator/graffito/trunk/jetspeed2-deploy/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/maven.xml?rev=365482&r1=365481&r2=365482&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/maven.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/maven.xml Mon Jan  2 16:01:59 2006
@@ -26,22 +26,6 @@
 		<copy todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF" overwrite="true">
 			<fileset dir="${maven.src.dir}" />
 		</copy>
-		<!-- Insert Graffito's ContentServer and ContentModel into the  -->
-		<!-- jetspeed-spring.xml from a Jetspeed running application    -->
-
-		<!-- util:loadText file="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/assembly/jetspeed-spring.xml"
var="jetspeedSpringXml"/ -->
-		<!--j:if test="${jetspeedSpringXml.indexOf('graffito') lt 0}">
-			<replaceregexp file="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/assembly/jetspeed-spring.xml">
-				<regexp pattern="(.+PortletRegistryComponent.+)" />
-				<substitution 
-					expression="&lt;entry key=\&quot;PermissionManager\&quot;&gt;&lt;ref
bean=\&quot;org.apache.jetspeed.security.PermissionManager\&quot;/&gt;&lt;/entry&gt;&lt;entry
key=\&quot;ContentServer\&quot;&gt;&lt;ref bean=\&quot;org.apache.portals.graffito.ContentServerService\&quot;/&gt;&lt;/entry&gt;&lt;entry
key=\&quot;ContentModel\&quot;&gt;&lt;ref bean=\&quot;org.apache.portals.graffito.ContentModelService\&quot;/&gt;&lt;/entry&gt;\1"

-					        
- 	
-							   
-				/>
-			</replaceregexp>
-		</j:if-->
-		
 		
 	</goal>
 </project>

Modified: incubator/graffito/trunk/jetspeed2-deploy/project.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/project.xml?rev=365482&r1=365481&r2=365482&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/project.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/project.xml Mon Jan  2 16:01:59 2006
@@ -23,14 +23,14 @@
 -->
 <project>
   <extend>${basedir}/../project.xml</extend>
-  <id>graffito-jetspeed2-deploy</id>
+  <id>graffito-jetspeed-2-deploy</id>
   <name>Graffito J2 deployemt</name>
   <description>Deployment files used for running Graffito within Jetspeed2. Mainly
PSML &amp; Spring assembly script</description>
   <shortDescription>Graffito J2-Deploy</shortDescription>
 
   <repository>
-    <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/jetspeed2-deploy</connection>
-    <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/jetspeed2-deploy</developerConnection>
+    <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/org.apache.portals.jetspeed-2-deploy</connection>
+    <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/org.apache.portals.jetspeed-2-deploy</developerConnection>
     <url>http://svn.apache.org/viewcvs</url>
   </repository>
 
@@ -38,36 +38,36 @@
   
     <dependency>
       <id>jetspeed-portal</id>
-      <groupId>jetspeed2</groupId>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
       <version>&jetspeed-version;</version>
     </dependency>   
 	
      <dependency>
       <id>jetspeed-api</id>
-      <groupId>jetspeed2</groupId>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
       <version>&jetspeed-version;</version>
     </dependency> 
 
      <dependency>
       <id>jetspeed-components</id>
-      <groupId>jetspeed2</groupId>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
       <version>&jetspeed-version;</version>
     </dependency> 
 		
     <dependency>  
       <id>graffito-commons</id>
-      <groupId>graffito</groupId>
+      <groupId>org.apache.portals.graffito</groupId>
       <version>1.0-a1-dev</version>
     </dependency>
     <dependency>  
       <id>graffito-api</id>
-      <groupId>graffito</groupId>
+      <groupId>org.apache.portals.graffito</groupId>
       <version>1.0-a1-dev</version>
     </dependency>
 
     <dependency>  
       <id>graffito-components</id>
-      <groupId>graffito</groupId>
+      <groupId>org.apache.portals.graffito</groupId>
       <version>1.0-a1-dev</version>
     </dependency> 
   </dependencies>

Modified: incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-services.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-services.xml?rev=365482&r1=365481&r2=365482&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-services.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-services.xml Mon Jan 
2 16:01:59 2006
@@ -77,24 +77,35 @@
 		  <entry key="DecorationLocator">
             <ref bean="DecorationLocator"/>
           </entry>		  
-          <entry key='ContentModel'>
-            <ref bean='org.apache.portals.graffito.services.core.ContentModelService'/>
-          </entry>          
-          <entry key='DocumentModel'>
-            <ref bean='org.apache.portals.graffito.services.dm.DocumentModelService'/>
-          </entry>          		  
-          <entry key='ContentServer'>
-            <ref bean='org.apache.portals.graffito.services.core.ContentServerService'/>
-          </entry>          
-          <entry key='ContentSearch'>
-            <ref bean='org.apache.portals.graffito.services.search.ContentSearchService'/>
-          </entry>                    
+		  <entry key="DecorationFactory">
+            <ref bean="DecorationFactory"/>
+          </entry>		  				 				 
 		  <entry key="PermissionManager">
             <ref bean="org.apache.jetspeed.security.PermissionManager"/>
           </entry>		            
 		  <entry key="PortalStatistics">
             <ref bean="PortalStatistics"/>
           </entry>		            
+		  <entry key="PortalAdministration">
+            <ref bean="PortalAdministration"/>
+          </entry>		                      
+	  <entry key="PreferencesProvider">
+            <ref bean="org.apache.jetspeed.prefs.PreferencesProvider"/>
+          </entry>
+	  
+	  <entry key='ContentModel'>
+		  <ref bean='org.apache.portals.graffito.services.core.ContentModelService'/>
+	  </entry>          
+	  <entry key='DocumentModel'>
+		  <ref bean='org.apache.portals.graffito.services.dm.DocumentModelService'/>
+	  </entry>          		  
+	  <entry key='ContentServer'>
+		  <ref bean='org.apache.portals.graffito.services.core.ContentServerService'/>
+	  </entry>          
+	  <entry key='ContentSearch'>
+		  <ref bean='org.apache.portals.graffito.services.search.ContentSearchService'/>
+	  </entry>                    
+	  
   	   	</map>
   	   </constructor-arg>
   </bean>

Modified: incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml?rev=365482&r1=365481&r2=365482&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly/pipelines.xml Mon Jan  2 16:01:59
2006
@@ -30,7 +30,7 @@
         init-method="initialize"
   >
    <constructor-arg>
-   	<ref bean="org.apache.jetspeed.capabilities.Capabilities" />
+       <ref bean="org.apache.jetspeed.capabilities.Capabilities" />
    </constructor-arg>
   </bean> 
   
@@ -44,13 +44,13 @@
         init-method="initialize"
   >
    <constructor-arg>
-   	<ref bean="org.apache.jetspeed.profiler.Profiler" />
+       <ref bean="org.apache.jetspeed.profiler.Profiler" />
    </constructor-arg>
    <constructor-arg>
-   	<ref bean="org.apache.jetspeed.security.UserManager" />
+       <ref bean="org.apache.jetspeed.security.UserManager" />
    </constructor-arg>
    <constructor-arg>
-   	<ref bean="PortalStatistics" />
+       <ref bean="PortalStatistics" />
    </constructor-arg>   
   </bean> 
   
@@ -61,21 +61,26 @@
   
   <bean id="loginValidationValve"
         class="org.apache.jetspeed.security.impl.LoginValidationValveImpl"
-        init-method="initialize"
-  />
-  
+        init-method="initialize">
+	  <!-- remove (from the session) the following list of session attributes upon login
-->
+       <constructor-arg index="0">
+            <list>
+                <value>org.apache.jetspeed.powertool.actions</value>
+            </list>		   
+	   </constructor-arg>	  
+  </bean>
   <bean id="profilerValve"
         class="org.apache.jetspeed.profiler.impl.ProfilerValveImpl"
         init-method="initialize"
   >
    <constructor-arg>
-   	<ref bean="org.apache.jetspeed.profiler.Profiler" />
+       <ref bean="org.apache.jetspeed.profiler.Profiler" />
    </constructor-arg>
    <constructor-arg>
-   	<ref bean="org.apache.jetspeed.portalsite.PortalSite" />
+       <ref bean="org.apache.jetspeed.portalsite.PortalSite" />
    </constructor-arg>
    <constructor-arg>
-   	<ref bean="org.apache.jetspeed.page.PageManager" />
+       <ref bean="org.apache.jetspeed.page.PageManager" />
    </constructor-arg>
   </bean> 
   
@@ -89,10 +94,10 @@
         init-method="initialize"
   >
    <constructor-arg>
-   	<ref bean="org.apache.pluto.PortletContainer" />
+       <ref bean="org.apache.pluto.PortletContainer" />
    </constructor-arg>
    <constructor-arg>   
-   	<ref bean="PortletWindowAccessor" />    
+       <ref bean="PortletWindowAccessor" />    
    </constructor-arg>   
   </bean> 
   
@@ -101,7 +106,7 @@
         init-method="initialize"
   >
    <constructor-arg>
-   	<ref bean="org.apache.jetspeed.aggregator.PortletAggregator"/>
+       <ref bean="org.apache.jetspeed.aggregator.PortletAggregator"/>
    </constructor-arg>
   </bean> 
 
@@ -110,7 +115,7 @@
         init-method="initialize"
   >
      <!-- portlet -->
-	 <constructor-arg index="0"><value>demo::ContentViewer</value></constructor-arg>
   
+     <constructor-arg index="0"><value>demo::ContentViewer</value></constructor-arg>
   
      <!-- entity -->
      <constructor-arg index="1"><value>public.content.21</value></constructor-arg>
   
   </bean> 
@@ -120,7 +125,7 @@
         init-method="initialize"
   >
    <constructor-arg>
-   	<ref bean="org.apache.jetspeed.aggregator.PageAggregator"/>
+       <ref bean="org.apache.jetspeed.aggregator.PageAggregator"/>
    </constructor-arg>
   </bean> 
   
@@ -135,9 +140,20 @@
         init-method="initialize"
   >
    <constructor-arg>
-   	<ref bean="AJAXService"/>
+       <ref bean="AJAXService"/>
    </constructor-arg>
   </bean> 
+  
+  <bean id="DecorationValve"
+        class="org.apache.jetspeed.decoration.DecorationValve"
+        init-method="initialize">
+        <constructor-arg>
+            <ref bean="DecorationFactory" />
+        </constructor-arg>
+		<constructor-arg>			
+			 <ref bean="PortletWindowAccessor" />
+		</constructor-arg>
+  </bean>
 
   <bean id="loginViewValve"
         class="org.apache.jetspeed.login.impl.LoginJSPViewValve"
@@ -155,14 +171,14 @@
    <constructor-arg>
    	<ref bean="org.apache.portals.graffito.context.CmsRequestContextManager" />
    </constructor-arg>  
-  </bean> 
-
+  </bean>
+  
   <bean id="jetspeed-pipeline"
         class="org.apache.jetspeed.pipeline.JetspeedPipeline"
         init-method="initialize"
   >
    <constructor-arg>
-   	<value>JetspeedPipeline</value>
+       <value>JetspeedPipeline</value>
    </constructor-arg>
    <constructor-arg>
     <list>
@@ -174,7 +190,8 @@
       <ref bean="loginValidationValve"/>
       <ref bean="GraffitoContextValve"/>
       <ref bean="profilerValve"/>
-      <ref bean="containerValve"/>
+      <ref bean="DecorationValve" />
+      <ref bean="containerValve"/>      
       <ref bean="actionValve"/>
       <ref bean="aggregatorValve"/>
       <ref bean="cleanUpValve"/>
@@ -187,7 +204,7 @@
         init-method="initialize"
   >
    <constructor-arg>
-   	<value>LoginPipeline</value>
+       <value>LoginPipeline</value>
    </constructor-arg>
    <constructor-arg>
     <list>
@@ -203,15 +220,15 @@
         init-method="initialize"
   >
    <constructor-arg>
-   	<value>ActionPipeline</value>
+       <value>ActionPipeline</value>
    </constructor-arg>
    <constructor-arg>
     <list>
-    	<ref bean="localizationValve"/>
-    	<ref bean="capabilityValve"/>
-      <ref bean="portalURLValve"/>
-    	<ref bean="containerValve"/>
-    	<ref bean="actionValve"/>
+        <ref bean="localizationValve"/>
+        <ref bean="capabilityValve"/>
+        <ref bean="portalURLValve"/>
+        <ref bean="containerValve"/>
+        <ref bean="actionValve"/>
     </list>
     </constructor-arg>
   </bean> 
@@ -221,17 +238,17 @@
         init-method="initialize"
   >
    <constructor-arg>
-   	<value>PortletPipeline</value>
+       <value>PortletPipeline</value>
    </constructor-arg>
    <constructor-arg>
     <list>
-        <ref bean="portalURLValve"/>    	    	
-    	<ref bean="capabilityValve"/>
-    	<ref bean="securityValve"/>    	    	
-    	<ref bean="localizationValve"/>
-        <ref bean="profilerValve"/>    	    	    	
-    	<ref bean="containerValve"/>
-    	<ref bean="portletValve"/>    
+        <ref bean="portalURLValve"/>                
+        <ref bean="capabilityValve"/>
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="containerValve"/>
+        <ref bean="portletValve"/>    
     </list>
     </constructor-arg>
   </bean> 
@@ -241,12 +258,17 @@
         init-method="initialize"
   >
    <constructor-arg>
-   	<value>AjaxPipeline</value>
+       <value>AjaxPipeline</value>
    </constructor-arg>
    <constructor-arg>
     <list>
-<!--    	<ref bean="securityValve"/>    	    	-->
-    	<ref bean="AJAXValve"/>
+        <ref bean="portalURLValve"/>                
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="containerValve"/>
+        <!-- TODO: replace layout valve with Ajax valve -->
+        <ref bean="layoutValve"/>
     </list>
     </constructor-arg>
   </bean> 
@@ -256,17 +278,17 @@
         init-method="initialize"
   >
    <constructor-arg>
-   	<value>FileServerPipeline</value>
+       <value>FileServerPipeline</value>
    </constructor-arg>
    <constructor-arg>
     <list>
-        <ref bean="portalURLValve"/>    	    	
-    	<ref bean="securityValve"/>    	    	
-    	<ref bean="localizationValve"/>
-        <ref bean="profilerValve"/>    	    	    	
-    	<ref bean="containerValve"/>
-    	<ref bean="fileServerValve"/>            
-    	<ref bean="portletValve"/>    
+        <ref bean="portalURLValve"/>                
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="containerValve"/>
+        <ref bean="fileServerValve"/>            
+        <ref bean="portletValve"/>    
     </list>
     </constructor-arg>
   </bean> 
@@ -281,7 +303,7 @@
             <entry key='/portal'>
                 <value>jetspeed-pipeline</value>
             </entry>
-            <entry key='/ajax'>
+            <entry key='/ajaxapi'>
                 <value>ajax-pipeline</value>
             </entry>
             <entry key='/login'>

Modified: incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml?rev=365482&r1=365481&r2=365482&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml (original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly/security-managers.xml Mon Jan 
2 16:01:59 2006
@@ -39,13 +39,16 @@
   </bean>
   
   <!-- Security: Permission Manager -->
+  <!--bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl" 
+  	   class="org.apache.jetspeed.security.impl.PermissionManagerImpl"  / -->
+  
   <bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl" 
   	   class="org.apache.portals.graffito.services.core.impl.ContentPermissionServiceImpl"
 />
   
   <bean id="org.apache.jetspeed.security.PermissionManager" parent="baseTransactionProxy"

 		name="permissionManager" >
 		<property name="proxyInterfaces">
-			<value>org.apache.portals.graffito.services.core.ContentPermissionService</value>
		
+			<value>org.apache.jetspeed.security.PermissionManager</value>
 		</property>
 		<property name="target">
 			<ref bean="org.apache.jetspeed.security.impl.PermissionManagerImpl"/>
@@ -61,6 +64,5 @@
 			</props>
 		</property>
    </bean>
-
 
 </beans>

Modified: incubator/graffito/trunk/jetspeed2-deploy/src/java/org/apache/portals/jetspeed/valve/GraffitoContextValve.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/java/org/apache/portals/jetspeed/valve/GraffitoContextValve.java?rev=365482&r1=365481&r2=365482&view=diff
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/java/org/apache/portals/jetspeed/valve/GraffitoContextValve.java
(original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/java/org/apache/portals/jetspeed/valve/GraffitoContextValve.java
Mon Jan  2 16:01:59 2006
@@ -20,7 +20,6 @@
 import javax.security.auth.Subject;
 
 import org.apache.jetspeed.pipeline.PipelineException;
-
 import org.apache.jetspeed.pipeline.valve.ValveContext;
 import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.security.impl.AbstractSecurityValve;
@@ -36,6 +35,7 @@
  */
 public class GraffitoContextValve extends AbstractSecurityValve
 {
+	
 
     private CmsRequestContextManager cmsRequestContextManager;
     
@@ -50,11 +50,19 @@
     }
     
     /**
+     * Initialize the valve before using in a pipeline.
+     */
+    public void initialize() throws PipelineException
+    {
+
+    }
+    
+    /**
      * 
      * @see org.apache.jetspeed.pipeline.valve.Valve#invoke(org.apache.jetspeed.request.RequestContext,
org.apache.jetspeed.pipeline.valve.ValveContext)
-     */
+     */    
     public void invoke(RequestContext request, ValveContext context) throws PipelineException
-    {
+    {    	
         Subject subject = getSubject(request);
         CmsRequestContext cmsRequestContext = new CmsRequestContextImpl();
         cmsRequestContext.setSubject(subject);



Mime
View raw message