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 dl...@apache.org on 2005/08/03 02:32:39 UTC

svn commit: r227142 - in /portals/jetspeed-2/trunk: ./ components/capability/ components/page-manager/src/java/org/apache/jetspeed/page/document/ components/page-manager/src/test/org/apache/jetspeed/page/ components/portal-site/src/test/org/apache/jets...

Author: dlestrat
Date: Tue Aug  2 17:32:26 2005
New Revision: 227142

URL: http://svn.apache.org/viewcvs?rev=227142&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-281

Modified:
    portals/jetspeed-2/trunk/components/capability/project.xml
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java
    portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
    portals/jetspeed-2/trunk/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java
    portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
    portals/jetspeed-2/trunk/components/prefs/project.xml
    portals/jetspeed-2/trunk/components/profiler/project.xml
    portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestDefaultInternalPasswordCredentialInterceptor.java
    portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialHistoryHandlingInterceptor.java
    portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialStateHandlingInterceptor.java
    portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestPasswordCredentialProvider.java
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/capabilities.xml
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/page-manager.xml
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/prefs.xml
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/profiler.xml
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/registry.xml
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/security-spi.xml
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/sso.xml
    portals/jetspeed-2/trunk/project-info.xml

Modified: portals/jetspeed-2/trunk/components/capability/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/capability/project.xml?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/project.xml (original)
+++ portals/jetspeed-2/trunk/components/capability/project.xml Tue Aug  2 17:32:26 2005
@@ -80,7 +80,7 @@
                     <directory>${basedir}/src/java</directory>
                     <excludes>
                         <exclude>**/*.java</exclude>
-                        <exclude>**/META-INF/**</exclude>
+                        <exclude>**/JETSPEED-INF/**</exclude>
                     </excludes>
                 </resource>
                 <resource>

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java Tue Aug  2 17:32:26 2005
@@ -186,7 +186,7 @@
             // marshal: use SAX I handler to filter document XML for
             // page and folder menu definition menu elements ordered
             // polymorphic collection to strip artifical <menu-element>
-            // tags enabling Castor XML binding; see META-INF/castor/page-mapping.xml
+            // tags enabling Castor XML binding; see JETSPEED-INF/castor/page-mapping.xml
             writer = new OutputStreamWriter(new FileOutputStream(f), PSML_DOCUMENT_ENCODING);
             Serializer serializer = new XMLSerializer(writer, this.format);
             final DocumentHandler handler = serializer.asDocumentHandler();
@@ -348,7 +348,7 @@
             // unmarshal: use SAX I parser to read document XML, filtering
             // for page and folder menu definition menu elements ordered
             // polymorphic collection to insert artifical <menu-element>
-            // tags enabling Castor XML binding; see META-INF/castor/page-mapping.xml
+            // tags enabling Castor XML binding; see JETSPEED-INF/castor/page-mapping.xml
             SAXParserFactory factory = SAXParserFactory.newInstance();
             SAXParser parser = factory.newSAXParser();
             XMLReader reader = parser.getXMLReader();

Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java Tue Aug  2 17:32:26 2005
@@ -99,10 +99,10 @@
         IdGenerator idGen = new JetspeedIdGenerator(65536,"P-","");
         FileCache cache = new FileCache(10, 12);
         
-        DocumentHandler psmlHandler = new CastorFileSystemDocumentHandler("/META-INF/castor/page-mapping.xml", Page.DOCUMENT_TYPE, Page.class, "target/testdata/pages", cache);
-        DocumentHandler linkHandler = new CastorFileSystemDocumentHandler("/META-INF/castor/page-mapping.xml", Link.DOCUMENT_TYPE, Link.class, "target/testdata/pages", cache);
-        DocumentHandler folderMetaDataHandler = new CastorFileSystemDocumentHandler("/META-INF/castor/page-mapping.xml", FolderMetaData.DOCUMENT_TYPE, FolderMetaData.class, "target/testdata/pages", cache);
-        DocumentHandler pageSecurityHandler = new CastorFileSystemDocumentHandler("/META-INF/castor/page-mapping.xml", PageSecurity.DOCUMENT_TYPE, PageSecurity.class, "target/testdata/pages", cache);
+        DocumentHandler psmlHandler = new CastorFileSystemDocumentHandler("/JETSPEED-INF/castor/page-mapping.xml", Page.DOCUMENT_TYPE, Page.class, "target/testdata/pages", cache);
+        DocumentHandler linkHandler = new CastorFileSystemDocumentHandler("/JETSPEED-INF/castor/page-mapping.xml", Link.DOCUMENT_TYPE, Link.class, "target/testdata/pages", cache);
+        DocumentHandler folderMetaDataHandler = new CastorFileSystemDocumentHandler("/JETSPEED-INF/castor/page-mapping.xml", FolderMetaData.DOCUMENT_TYPE, FolderMetaData.class, "target/testdata/pages", cache);
+        DocumentHandler pageSecurityHandler = new CastorFileSystemDocumentHandler("/JETSPEED-INF/castor/page-mapping.xml", PageSecurity.DOCUMENT_TYPE, PageSecurity.class, "target/testdata/pages", cache);
         
         DocumentHandlerFactory handlerFactory = new DocumentHandlerFactoryImpl();
         handlerFactory.registerDocumentHandler(psmlHandler);

Modified: portals/jetspeed-2/trunk/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/test/org/apache/jetspeed/portalsite/TestPortalSite.java Tue Aug  2 17:32:26 2005
@@ -103,7 +103,7 @@
      */
     protected String[] getConfigurations()
     {
-        return new String[] {"/META-INF/test-spring.xml"};
+        return new String[] {"/JETSPEED-INF/spring/test-spring.xml"};
     }
 
     /**

Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java Tue Aug  2 17:32:26 2005
@@ -276,7 +276,7 @@
         String[] confs = super.getConfigurations();
         List confList = new ArrayList(Arrays.asList(confs));
         confList.add("registry.xml");
-        confList.add("META-INF/user-info.xml");
+        confList.add("JETSPEED-INF/spring/user-info.xml");
         return (String[]) confList.toArray(new String[1]);
     }
 }

Modified: portals/jetspeed-2/trunk/components/prefs/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/project.xml?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/project.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/project.xml Tue Aug  2 17:32:26 2005
@@ -82,7 +82,7 @@
                     <directory>${basedir}/src/java</directory>
                     <excludes>
                         <exclude>**/*.java</exclude>
-                        <exclude>**/META-INF/**</exclude>
+                        <exclude>**/JETSPEED-INF/**</exclude>
                     </excludes>
                 </resource>
                 <resource>

Modified: portals/jetspeed-2/trunk/components/profiler/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/project.xml?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/project.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/project.xml Tue Aug  2 17:32:26 2005
@@ -84,7 +84,7 @@
                     <directory>${basedir}/src/java</directory>
                     <excludes>
                         <exclude>**/*.java</exclude>
-                        <exclude>**/META-INF/**</exclude>
+                        <exclude>**/JETSPEED-INF/**</exclude>
                     </excludes>
                 </resource>
                 <resource>

Modified: portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestDefaultInternalPasswordCredentialInterceptor.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestDefaultInternalPasswordCredentialInterceptor.java?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestDefaultInternalPasswordCredentialInterceptor.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestDefaultInternalPasswordCredentialInterceptor.java Tue Aug  2 17:32:26 2005
@@ -91,7 +91,7 @@
     {
         String[] confs = super.getConfigurations();
         List confList = new ArrayList(Arrays.asList(confs));
-        confList.add("META-INF/defipci.xml");
+        confList.add("JETSPEED-INF/spring/defipci.xml");
         return (String[])confList.toArray(new String[1]);
     }    
 }

Modified: portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialHistoryHandlingInterceptor.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialHistoryHandlingInterceptor.java?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialHistoryHandlingInterceptor.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialHistoryHandlingInterceptor.java Tue Aug  2 17:32:26 2005
@@ -93,7 +93,7 @@
     {
         String[] confs = super.getConfigurations();
         List confList = new ArrayList(Arrays.asList(confs));
-        confList.add("META-INF/sipchhi.xml");
+        confList.add("JETSPEED-INF/spring/sipchhi.xml");
         return (String[])confList.toArray(new String[1]);
     }    
 }

Modified: portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialStateHandlingInterceptor.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialStateHandlingInterceptor.java?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialStateHandlingInterceptor.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestInternalPasswordCredentialStateHandlingInterceptor.java Tue Aug  2 17:32:26 2005
@@ -102,7 +102,7 @@
     {
         String[] confs = super.getConfigurations();
         List confList = new ArrayList(Arrays.asList(confs));
-        confList.add("META-INF/sipcshi.xml");
+        confList.add("JETSPEED-INF/spring/sipcshi.xml");
         return (String[])confList.toArray(new String[1]);
     }    
 }

Modified: portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestPasswordCredentialProvider.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestPasswordCredentialProvider.java?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestPasswordCredentialProvider.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/spi/TestPasswordCredentialProvider.java Tue Aug  2 17:32:26 2005
@@ -154,7 +154,7 @@
     {
         String[] confs = super.getConfigurations();
         List confList = new ArrayList(Arrays.asList(confs));
-        confList.add("META-INF/spcpv.xml");
+        confList.add("JETSPEED-INF/spring/spcpv.xml");
         return (String[]) confList.toArray(new String[1]);
     }    
 }

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/capabilities.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/capabilities.xml?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/capabilities.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/capabilities.xml Tue Aug  2 17:32:26 2005
@@ -20,7 +20,7 @@
     <!-- Capabilities DAO-->
     <bean id="capabilitiesImpl" class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities" init-method="init">
         <constructor-arg>
-            <value>META-INF/ojb/capabilities_repository.xml</value>
+            <value>JETSPEED-INF/ojb/capabilities_repository.xml</value>
         </constructor-arg>
     </bean>
 

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/page-manager.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/page-manager.xml?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/page-manager.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/page-manager.xml Tue Aug  2 17:32:26 2005
@@ -20,7 +20,7 @@
   <!-- PageManager -->
   <bean id="PsmlDocumentHandler"      
        class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/META-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
        <constructor-arg index="1"><value>.psml</value></constructor-arg>
        <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.Page</value></constructor-arg>       
        <constructor-arg index="3" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
@@ -29,7 +29,7 @@
   
   <bean id="LinkDocumentHandler"       
        class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/META-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
        <constructor-arg index="1"><value>.link</value></constructor-arg>
        <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.Link</value></constructor-arg>       
        <constructor-arg index="3" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
@@ -38,7 +38,7 @@
   
   <bean id="FolderMetaDataDocumentHandler"         
        class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/META-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
        <constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
        <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.FolderMetaData</value></constructor-arg>       
        <constructor-arg index="3" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
@@ -47,7 +47,7 @@
   
   <bean id="PageSecurityDocumentHandler"       
        class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/META-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
        <constructor-arg index="1"><value>page.security</value></constructor-arg>
        <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.PageSecurity</value></constructor-arg>       
        <constructor-arg index="3" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/prefs.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/prefs.xml?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/prefs.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/prefs.xml Tue Aug  2 17:32:26 2005
@@ -20,7 +20,7 @@
     <!-- Preferences Implementation -->
     <bean id="PreferencesProviderImpl" class="org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider" name="prefsPersistenceBroker" init-method="init">
         <constructor-arg index="0">
-            <value>META-INF/ojb/prefs_repository.xml</value>
+            <value>JETSPEED-INF/ojb/prefs_repository.xml</value>
         </constructor-arg>
         <constructor-arg type="boolean" index="1">
             <value>false</value>

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/profiler.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/profiler.xml?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/profiler.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/profiler.xml Tue Aug  2 17:32:26 2005
@@ -19,7 +19,7 @@
     <!-- Profiler -->
     <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" name="profilerImpl" init-method="init">
         <constructor-arg index="0">
-            <value>META-INF/ojb/profiler_repository.xml</value>
+            <value>JETSPEED-INF/ojb/profiler_repository.xml</value>
         </constructor-arg>
         <constructor-arg index="1">
             <value>j2</value>

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/registry.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/registry.xml?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/registry.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/registry.xml Tue Aug  2 17:32:26 2005
@@ -24,7 +24,7 @@
     <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry" init-method="init">
 
         <constructor-arg index="0">
-            <value>META-INF/ojb/registry_repository.xml</value>
+            <value>JETSPEED-INF/ojb/registry_repository.xml</value>
         </constructor-arg>
         <constructor-arg index="1">
             <ref bean="portletFactory" />

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/security-spi.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/security-spi.xml?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/security-spi.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/security-spi.xml Tue Aug  2 17:32:26 2005
@@ -23,7 +23,7 @@
   	   class="org.apache.jetspeed.security.spi.impl.SecurityAccessImpl"
   	   init-method="init"
   >  	   
-  	   <constructor-arg ><value>META-INF/ojb/security_repository.xml</value></constructor-arg>  	   
+  	   <constructor-arg ><value>JETSPEED-INF/ojb/security_repository.xml</value></constructor-arg>  	   
   </bean>
   
   <bean id="org.apache.jetspeed.security.spi.SecurityAccess" parent="baseTransactionProxy" 

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/sso.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/sso.xml?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/sso.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/assembly/sso.xml Tue Aug  2 17:32:26 2005
@@ -19,7 +19,7 @@
     <!-- SSO Implementation -->
     <bean id="PersistenceBrokerSSOProvider" class="org.apache.jetspeed.sso.impl.PersistenceBrokerSSOProvider" init-method="init">
         <constructor-arg index="0">
-            <value>META-INF/ojb/sso_repository.xml</value>
+            <value>JETSPEED-INF/ojb/sso_repository.xml</value>
         </constructor-arg>
     </bean>
 

Modified: portals/jetspeed-2/trunk/project-info.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project-info.xml?rev=227142&r1=227141&r2=227142&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project-info.xml (original)
+++ portals/jetspeed-2/trunk/project-info.xml Tue Aug  2 17:32:26 2005
@@ -171,7 +171,7 @@
 	          <excludes>
 	           <exclude>**/*.java</exclude>
 			   <!--
-	           <exclude>**/META-INF/**</exclude>
+	           <exclude>**/JETSPEED-INF/**</exclude>
 			   -->
 	          </excludes>
 	        </resource>



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