portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r725977 [12/48] - in /portals/jetspeed-2/portal/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/ applications/jetspeed/src/main/javascrip...
Date Fri, 12 Dec 2008 12:07:04 GMT
Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestSecurePermissionsDatabasePageManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestTransactions.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestTransactions.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestTransactions.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestTransactions.java Fri Dec 12 04:06:29 2008
@@ -1,92 +1,92 @@
-/*
+/*
  * 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.
- */
-package org.apache.jetspeed.page;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
-import org.apache.jetspeed.om.folder.Folder;
-import org.apache.jetspeed.om.page.Page;
-import org.apache.jetspeed.page.impl.DatabasePageManagerCache;
-
-/**
- * Test Transactions
- * 
- * @author <a href="rwatler@apache.org">Randy Watler</a>
- * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
- * @version $Id: $
- *          
- */
-public class TestTransactions extends  DatasourceEnabledSpringTestCase implements PageManagerTestShared
-{
-    public static void main(String args[])
-    {
-        junit.awtui.TestRunner.main(new String[]
-        { TestTransactions.class.getName() });
-    }
-    
-    public static Test suite()
-    {
-        // All methods starting with "test" will be executed in the test suite.
-        return new TestSuite(TestTransactions.class);
-    }
-    
-    protected String[] getConfigurations()
-    {
-        return new String[]{"database-page-manager.xml", "transaction.xml"}; 
-    }
-
-    public void testTx() throws Exception
-    {
-        PageManager pageManager = (PageManager)scm.getComponent("pageManager");
-
-        if (pageManager.folderExists("/"))
-        {
-            pageManager.removeFolder(pageManager.getFolder("/"));
-        }
-        Folder root = pageManager.newFolder("/");
-        pageManager.updateFolder(root);
-        
-        System.out.println("--- before new Page");
-        DatabasePageManagerCache.dump();
-        
-        Page[] pages = new Page[3];
-        pages[0] = pageManager.newPage("/tx__test1.psml");
-        pages[1] = pageManager.newPage("/tx__test2.psml");
-        pages[2] = pageManager.newPage("/tx__test3.psml");
-        
-        System.out.println("--- after new Page");
-        DatabasePageManagerCache.dump();
-        
-        try
-        {
-            pageManager.addPages(pages);
-        }
-        catch (Exception e)
-        {
-            System.out.println("Exception adding pages" + e);
-        }
-
-        System.out.println("--- after rollback");
-        DatabasePageManagerCache.dump();
-
-        assertFalse("page 1 found", pageManager.pageExists("/tx__test1.psml"));
-        assertFalse("page 2 found", pageManager.pageExists("/tx__test2.psml"));
-        assertFalse("page 3 found", pageManager.pageExists("/tx__test3.psml"));
-    }
-}
+ * 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.
+ */
+package org.apache.jetspeed.page;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
+import org.apache.jetspeed.om.folder.Folder;
+import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.page.impl.DatabasePageManagerCache;
+
+/**
+ * Test Transactions
+ * 
+ * @author <a href="rwatler@apache.org">Randy Watler</a>
+ * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
+ * @version $Id: $
+ *          
+ */
+public class TestTransactions extends  DatasourceEnabledSpringTestCase implements PageManagerTestShared
+{
+    public static void main(String args[])
+    {
+        junit.awtui.TestRunner.main(new String[]
+        { TestTransactions.class.getName() });
+    }
+    
+    public static Test suite()
+    {
+        // All methods starting with "test" will be executed in the test suite.
+        return new TestSuite(TestTransactions.class);
+    }
+    
+    protected String[] getConfigurations()
+    {
+        return new String[]{"database-page-manager.xml", "transaction.xml"}; 
+    }
+
+    public void testTx() throws Exception
+    {
+        PageManager pageManager = (PageManager)scm.getComponent("pageManager");
+
+        if (pageManager.folderExists("/"))
+        {
+            pageManager.removeFolder(pageManager.getFolder("/"));
+        }
+        Folder root = pageManager.newFolder("/");
+        pageManager.updateFolder(root);
+        
+        System.out.println("--- before new Page");
+        DatabasePageManagerCache.dump();
+        
+        Page[] pages = new Page[3];
+        pages[0] = pageManager.newPage("/tx__test1.psml");
+        pages[1] = pageManager.newPage("/tx__test2.psml");
+        pages[2] = pageManager.newPage("/tx__test3.psml");
+        
+        System.out.println("--- after new Page");
+        DatabasePageManagerCache.dump();
+        
+        try
+        {
+            pageManager.addPages(pages);
+        }
+        catch (Exception e)
+        {
+            System.out.println("Exception adding pages" + e);
+        }
+
+        System.out.println("--- after rollback");
+        DatabasePageManagerCache.dump();
+
+        assertFalse("page 1 found", pageManager.pageExists("/tx__test1.psml"));
+        assertFalse("page 2 found", pageManager.pageExists("/tx__test2.psml"));
+        assertFalse("page 3 found", pageManager.pageExists("/tx__test3.psml"));
+    }
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestTransactions.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/DatabasePageManagerServer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/TestDatabasePageManagerCache.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java Fri Dec 12 04:06:29 2008
@@ -1,171 +1,171 @@
-/*
- * 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.
- */
-package org.apache.jetspeed.page.document.psml;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import net.sf.ehcache.CacheManager;
-
-import org.apache.jetspeed.om.page.Document;
-import org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl;
-import org.apache.jetspeed.page.document.DocumentHandlerFactory;
-import org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl;
-import org.apache.jetspeed.test.JetspeedTestCase;
-import org.apache.jetspeed.cache.file.FileCache;
-import org.apache.jetspeed.cache.impl.EhCacheImpl;
-
-/**
- * <p>
- * TestCastorFileSystemDocumentHandler
- * </p>
- * <p>
- * 
- * </p>
- * 
- * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
- * @version $Id$
- *  
- */
-public class TestCastorFileSystemDocumentHandler extends JetspeedTestCase
-{
-    protected FileCache cache;
-    protected CastorFileSystemDocumentHandler folderMetaDataDocumentHandler;
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see junit.framework.TestCase#setUp()
-     */
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-
-        cache = new FileCache(new EhCacheImpl(CacheManager.getInstance().getEhcache("pageFileCache")), 10);
-        
-        folderMetaDataDocumentHandler = new CastorFileSystemDocumentHandler(
-            "/JETSPEED-INF/castor/page-mapping.xml",
-            "folder.metadata",
-            FolderMetaDataImpl.class,
-            getBaseDir()+"src/test/testdata/pages",
-            cache);
-            
-        Map handlerMap = new HashMap();
-        handlerMap.put("folder.metadata", folderMetaDataDocumentHandler);
-        DocumentHandlerFactory handlerFactory = new DocumentHandlerFactoryImpl(handlerMap);
-        folderMetaDataDocumentHandler.setHandlerFactory(handlerFactory);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see junit.framework.TestCase#tearDown
-     */
-    protected void tearDown() throws Exception
-    {
-        super.tearDown();
-
-        cache.evictAll();
-        folderMetaDataDocumentHandler.shutdown();
-    }
-
-    /**
-     * Defines the testcase name for JUnit.
-     * 
-     * @param name
-     *            the testcase's name.
-     */
-    public TestCastorFileSystemDocumentHandler( String name )
-    {
-        super(name);
-    }
-
-    /**
-     * Start the tests.
-     * 
-     * @param args
-     *            the arguments. Not used
-     */
-    public static void main( String args[] )
-    {
-        junit.awtui.TestRunner.main(new String[]{TestCastorFileSystemDocumentHandler.class.getName()});
-    }
-
-    /**
-     * Creates the test suite.
-     * 
-     * @return a test suite (<code>TestSuite</code>) that includes all
-     *         methods starting with "test"
-     */
-    public static Test suite()
-    {
-        // All methods starting with "test" will be executed in the test suite.
-        return new TestSuite(TestCastorFileSystemDocumentHandler.class);
-    }
-    
-    public void testFolderMetaData() throws Exception
-    {
-        Document doc = folderMetaDataDocumentHandler.getDocument("/folder1/folder.metadata", false);
-        assertNotNull(doc);
-        String title = doc.getTitle();
-        assertEquals("Default Title for Folder 1", title);
-    }
-
-    public void testFolderMetaDataInParallel() throws Exception
-    {
-        Thread [] threads = new Thread[10];
-        int i;
-        final List exceptions = new ArrayList(10);
-        
-        for (i = 0; i < threads.length; i++)
-        {
-            threads[i] = new Thread(new Runnable()
-                {
-                    public void run()
-                    {
-                        try
-                        {
-                            Document doc = folderMetaDataDocumentHandler.getDocument("/folder1/folder.metadata", false);
-                        }
-                        catch (Exception e)
-                        {
-                            e.printStackTrace(System.out);
-                            exceptions.add(e);
-                        }
-                    }
-                });
-        }
-        
-        for (i = 0; i < threads.length; i++)
-        {
-            threads[i].start();
-        }
-        
-        for (i = 0; i < threads.length; i++)
-        {
-            threads[i].join();
-        }
-        
-        assertTrue("folderMetaDataDocumentHandler.getDocument() is not thread-safe!", exceptions.size() == 0);
-    }
-
-}
+/*
+ * 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.
+ */
+package org.apache.jetspeed.page.document.psml;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import net.sf.ehcache.CacheManager;
+
+import org.apache.jetspeed.om.page.Document;
+import org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl;
+import org.apache.jetspeed.page.document.DocumentHandlerFactory;
+import org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl;
+import org.apache.jetspeed.test.JetspeedTestCase;
+import org.apache.jetspeed.cache.file.FileCache;
+import org.apache.jetspeed.cache.impl.EhCacheImpl;
+
+/**
+ * <p>
+ * TestCastorFileSystemDocumentHandler
+ * </p>
+ * <p>
+ * 
+ * </p>
+ * 
+ * @author <a href="mailto:woonsan@apache.org">Woonsan Ko</a>
+ * @version $Id$
+ *  
+ */
+public class TestCastorFileSystemDocumentHandler extends JetspeedTestCase
+{
+    protected FileCache cache;
+    protected CastorFileSystemDocumentHandler folderMetaDataDocumentHandler;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+
+        cache = new FileCache(new EhCacheImpl(CacheManager.getInstance().getEhcache("pageFileCache")), 10);
+        
+        folderMetaDataDocumentHandler = new CastorFileSystemDocumentHandler(
+            "/JETSPEED-INF/castor/page-mapping.xml",
+            "folder.metadata",
+            FolderMetaDataImpl.class,
+            getBaseDir()+"src/test/testdata/pages",
+            cache);
+            
+        Map handlerMap = new HashMap();
+        handlerMap.put("folder.metadata", folderMetaDataDocumentHandler);
+        DocumentHandlerFactory handlerFactory = new DocumentHandlerFactoryImpl(handlerMap);
+        folderMetaDataDocumentHandler.setHandlerFactory(handlerFactory);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see junit.framework.TestCase#tearDown
+     */
+    protected void tearDown() throws Exception
+    {
+        super.tearDown();
+
+        cache.evictAll();
+        folderMetaDataDocumentHandler.shutdown();
+    }
+
+    /**
+     * Defines the testcase name for JUnit.
+     * 
+     * @param name
+     *            the testcase's name.
+     */
+    public TestCastorFileSystemDocumentHandler( String name )
+    {
+        super(name);
+    }
+
+    /**
+     * Start the tests.
+     * 
+     * @param args
+     *            the arguments. Not used
+     */
+    public static void main( String args[] )
+    {
+        junit.awtui.TestRunner.main(new String[]{TestCastorFileSystemDocumentHandler.class.getName()});
+    }
+
+    /**
+     * Creates the test suite.
+     * 
+     * @return a test suite (<code>TestSuite</code>) that includes all
+     *         methods starting with "test"
+     */
+    public static Test suite()
+    {
+        // All methods starting with "test" will be executed in the test suite.
+        return new TestSuite(TestCastorFileSystemDocumentHandler.class);
+    }
+    
+    public void testFolderMetaData() throws Exception
+    {
+        Document doc = folderMetaDataDocumentHandler.getDocument("/folder1/folder.metadata", false);
+        assertNotNull(doc);
+        String title = doc.getTitle();
+        assertEquals("Default Title for Folder 1", title);
+    }
+
+    public void testFolderMetaDataInParallel() throws Exception
+    {
+        Thread [] threads = new Thread[10];
+        int i;
+        final List exceptions = new ArrayList(10);
+        
+        for (i = 0; i < threads.length; i++)
+        {
+            threads[i] = new Thread(new Runnable()
+                {
+                    public void run()
+                    {
+                        try
+                        {
+                            Document doc = folderMetaDataDocumentHandler.getDocument("/folder1/folder.metadata", false);
+                        }
+                        catch (Exception e)
+                        {
+                            e.printStackTrace(System.out);
+                            exceptions.add(e);
+                        }
+                    }
+                });
+        }
+        
+        for (i = 0; i < threads.length; i++)
+        {
+            threads[i].start();
+        }
+        
+        for (i = 0; i < threads.length; i++)
+        {
+            threads[i].join();
+        }
+        
+        assertTrue("folderMetaDataDocumentHandler.getDocument() is not thread-safe!", exceptions.size() == 0);
+    }
+
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/database-page-manager-base.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/database-page-manager.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/distributed-ehcache.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/ehcache.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/interceptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/log4j-stdout.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/resources/secure-permissions-database-page-manager.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/default-page.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/default-page.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/default-page.psml Fri Dec 12 04:06:29 2008
@@ -15,9 +15,9 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<page id="role1-001" 
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="role1-001" 
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 	<defaults 
 	    layout-decorator="tigris" 

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/default-page.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/sub1/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/sub1/default-page.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/sub1/default-page.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/sub1/default-page.psml Fri Dec 12 04:06:29 2008
@@ -15,9 +15,9 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<page id="role1-001-1"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="role1-001-1"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 	<defaults 
 	    layout-decorator="tigris" 

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/sub1/default-page.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role2/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role2/default-page.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role2/default-page.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role2/default-page.psml Fri Dec 12 04:06:29 2008
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?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.
--->
-<page id="role2-001"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
-	<defaults 
-	    layout-decorator="tigris" 
-		portlet-decorator="tigris" />
-	<title>Role Two</title>
-	<fragment id="role2-002" type="layout" name="TwoColumns">
-		<fragment id="role2-003" type="portlet" name="j2-admin::LoginPortlet">
-			<property layout="TwoColumns" name="row" value="0" />
-			<property layout="TwoColumns" name="column" value="0" />
-		</fragment>
-	</fragment>
-</page>
+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.
+-->
+<page id="role2-001"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
+	<defaults 
+	    layout-decorator="tigris" 
+		portlet-decorator="tigris" />
+	<title>Role Two</title>
+	<fragment id="role2-002" type="layout" name="TwoColumns">
+		<fragment id="role2-003" type="portlet" name="j2-admin::LoginPortlet">
+			<property layout="TwoColumns" name="row" value="0" />
+			<property layout="TwoColumns" name="column" value="0" />
+		</fragment>
+	</fragment>
+</page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role2/default-page.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role3/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role3/default-page.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role3/default-page.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role3/default-page.psml Fri Dec 12 04:06:29 2008
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?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.
--->
-<page id="role3-001"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
-	<defaults 
-	    layout-decorator="tigris" 
-		portlet-decorator="tigris" />
-	<title>Role Three</title>
-	<fragment id="role3-002" type="layout" name="TwoColumns">
-		<fragment id="role3-003" type="portlet" name="j2-admin::ChangePasswordPortlet">
-			<property layout="TwoColumns" name="row" value="0" />
-			<property layout="TwoColumns" name="column" value="0" />
-		</fragment>
-	</fragment>
-</page>
+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.
+-->
+<page id="role3-001"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
+	<defaults 
+	    layout-decorator="tigris" 
+		portlet-decorator="tigris" />
+	<title>Role Three</title>
+	<fragment id="role3-002" type="layout" name="TwoColumns">
+		<fragment id="role3-003" type="portlet" name="j2-admin::ChangePasswordPortlet">
+			<property layout="TwoColumns" name="row" value="0" />
+			<property layout="TwoColumns" name="column" value="0" />
+		</fragment>
+	</fragment>
+</page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role3/default-page.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/clonetest.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/clonetest.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/clonetest.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/clonetest.psml Fri Dec 12 04:06:29 2008
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?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.
--->
-<page id="test001"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
-  <defaults
-     skin="test-skin"
-     layout-decorator="test-layout"
-     portlet-decorator="test-portlet"
-  />
-  <title>Test Page</title>
-  <metadata name="description">Test001 description</metadata>
-  <metadata name="description" xml:lang="en">En Descr</metadata>
-  <metadata name="subject">Test Subject</metadata>
-  
-  <fragment id="f001" type="layout" name="TwoColumns">
-    <fragment id="pe001" type="portlet" name="HelloPortlet">
-      <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="0" />      
-    </fragment>
-    <fragment id="pe002" type="portlet" name="JMXPortlet">
-      <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="1" />      
-    </fragment>
-    <fragment id="f002" type="layout" name="Card" decorator="Tab">
-      <property layout="TwoColumns" name="row" value="1" />
-      <property layout="TwoColumns" name="column" value="0" />      
-      <fragment id="pe003" type="portlet" name="CustomerList"/>
-      <fragment id="pe004" type="portlet" name="CustomerInfo"/>
-    </fragment>
-  </fragment>
-
-  <security-constraints>
-         <owner>new-user</owner>
-         <security-constraint>
-             <users>user10,user11</users>
-             <roles>*</roles>
-             <permissions>edit,view</permissions>
-         </security-constraint>
-         <security-constraints-ref>public-view</security-constraints-ref>
-  </security-constraints>
-     
-  <menu name="simple">
-    <options>/folder1/folder1</options>
-    <options>/folder1/folder2</options>
-  </menu>
-
-</page>
+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.
+-->
+<page id="test001"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
+  <defaults
+     skin="test-skin"
+     layout-decorator="test-layout"
+     portlet-decorator="test-portlet"
+  />
+  <title>Test Page</title>
+  <metadata name="description">Test001 description</metadata>
+  <metadata name="description" xml:lang="en">En Descr</metadata>
+  <metadata name="subject">Test Subject</metadata>
+  
+  <fragment id="f001" type="layout" name="TwoColumns">
+    <fragment id="pe001" type="portlet" name="HelloPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="0" />      
+    </fragment>
+    <fragment id="pe002" type="portlet" name="JMXPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="1" />      
+    </fragment>
+    <fragment id="f002" type="layout" name="Card" decorator="Tab">
+      <property layout="TwoColumns" name="row" value="1" />
+      <property layout="TwoColumns" name="column" value="0" />      
+      <fragment id="pe003" type="portlet" name="CustomerList"/>
+      <fragment id="pe004" type="portlet" name="CustomerInfo"/>
+    </fragment>
+  </fragment>
+
+  <security-constraints>
+         <owner>new-user</owner>
+         <security-constraint>
+             <users>user10,user11</users>
+             <roles>*</roles>
+             <permissions>edit,view</permissions>
+         </security-constraint>
+         <security-constraints-ref>public-view</security-constraints-ref>
+  </security-constraints>
+     
+  <menu name="simple">
+    <options>/folder1/folder1</options>
+    <options>/folder1/folder2</options>
+  </menu>
+
+</page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/clonetest.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/default-page.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/default-page.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/default-page.psml Fri Dec 12 04:06:29 2008
@@ -15,9 +15,9 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<page id="p001"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="p001"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 	<defaults skin="light-blue" layout-decorator="clear" 
 		portlet-decorator="box-titled" />

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/default-page.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder.metadata
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder.metadata?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder.metadata (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder.metadata Fri Dec 12 04:06:29 2008
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?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.
+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.
 -->
 <folder 
     xmlns="http://portals.apache.org/jetspeed"

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder.metadata
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder.metadata
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder.metadata?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder2/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder2/default-page.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder2/default-page.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder2/default-page.psml Fri Dec 12 04:06:29 2008
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?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.
--->
-<page id="p001"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
-  <defaults
-     skin="light-blue"
-     layout-decorator="clear"
-     portlet-decorator="box-titled"
-  />
-  <fragment id="f001" type="layout" name="TwoColumns">
-    <fragment id="pe001" type="portlet" name="HelloPortlet">
-      <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="0" />      
-    </fragment>
-    <fragment id="pe002" type="portlet" name="JMXPortlet">
-      <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="1" />      
-    </fragment>
-    <fragment id="pe003" type="portlet" name="CustomerList">
-      <property layout="TwoColumns" name="row" value="1" />
-      <property layout="TwoColumns" name="column" value="0" />      
-    </fragment>
-    <fragment id="pe004" type="portlet" name="CustomerInfo">
-      <property layout="TwoColumns" name="row" value="1" />
-      <property layout="TwoColumns" name="column" value="1" />      
-    </fragment>
-  </fragment>
-</page>
+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.
+-->
+<page id="p001"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
+  <defaults
+     skin="light-blue"
+     layout-decorator="clear"
+     portlet-decorator="box-titled"
+  />
+  <fragment id="f001" type="layout" name="TwoColumns">
+    <fragment id="pe001" type="portlet" name="HelloPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="0" />      
+    </fragment>
+    <fragment id="pe002" type="portlet" name="JMXPortlet">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="1" />      
+    </fragment>
+    <fragment id="pe003" type="portlet" name="CustomerList">
+      <property layout="TwoColumns" name="row" value="1" />
+      <property layout="TwoColumns" name="column" value="0" />      
+    </fragment>
+    <fragment id="pe004" type="portlet" name="CustomerInfo">
+      <property layout="TwoColumns" name="row" value="1" />
+      <property layout="TwoColumns" name="column" value="1" />      
+    </fragment>
+  </fragment>
+</page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder2/default-page.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/default-page.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/folder.metadata
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/folder.metadata?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/test001.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/test001.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
Binary files - no diff available.

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/pageWithSomeIds.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/pageWithoutIds.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/test001.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/test001.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
Binary files - no diff available.

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/group/apache/html/news.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_hu.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ua.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ua.properties (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ua.properties Fri Dec 12 04:06:29 2008
@@ -3,16 +3,16 @@
 # 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.
-
-## menu separators
-menu.separator.folders=\u041f\u0430\u043f\u043a\u0438
-menu.separator.links=\u0414\u043e\u0434\u0430\u0442\u043a\u043e\u0432\u0456 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f
+# 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.
+
+## menu separators
+menu.separator.folders=\u041f\u0430\u043f\u043a\u0438
+menu.separator.links=\u0414\u043e\u0434\u0430\u0442\u043a\u043e\u0432\u0456 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_ua.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh_TW.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh_TW.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh_TW.properties (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh_TW.properties Fri Dec 12 04:06:29 2008
@@ -3,17 +3,17 @@
 # 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.
-#
-
-## menu separators
-menu.separator.folders=\u6a94\u6848\u593e
-menu.separator.links=\u9023\u7d50
+# 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.
+#
+
+## menu separators
+menu.separator.folders=\u6a94\u6848\u593e
+menu.separator.links=\u9023\u7d50

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuSeparators_zh_TW.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_hu.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ua.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ua.properties (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ua.properties Fri Dec 12 04:06:29 2008
@@ -3,16 +3,16 @@
 # 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.
-
-## menu titles
-menu.title.back=\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438\u0441\u044c \u0434\u043e
-menu.title.breadcrumbs=\u0412\u0438 \u043f\u0435\u0440\u0435\u0431\u0443\u0432\u0430\u0454\u0442\u0435 \u0442\u0443\u0442:
+# 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.
+
+## menu titles
+menu.title.back=\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438\u0441\u044c \u0434\u043e
+menu.title.breadcrumbs=\u0412\u0438 \u043f\u0435\u0440\u0435\u0431\u0443\u0432\u0430\u0454\u0442\u0435 \u0442\u0443\u0442:

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_ua.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh_TW.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh_TW.properties?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh_TW.properties (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh_TW.properties Fri Dec 12 04:06:29 2008
@@ -3,17 +3,17 @@
 # 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.
-#
-
-## menu titles
-menu.title.back=\u56de\u5230
-menu.title.breadcrumbs=\u76ee\u524d\u4f4d\u7f6e
+# 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.
+#
+
+## menu titles
+menu.title.back=\u56de\u5230
+menu.title.breadcrumbs=\u76ee\u524d\u4f4d\u7f6e

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/menu/resources/MenuTitles_zh_TW.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/somerole/users-page.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml Fri Dec 12 04:06:29 2008
@@ -17,9 +17,9 @@
 limitations under the License.
 -->
 
-<page id="page30"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="page30"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
   <title>/page0.psml</title>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/folder.metadata
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/page0.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/page0.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/page0.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/page0.psml Fri Dec 12 04:06:29 2008
@@ -17,12 +17,12 @@
 limitations under the License.
 -->
 
-<page id="__subsite-root-page0"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="__subsite-root-page0"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
-  <title>/page0.psml</title>
+  <title>/page0.psml</title>
   <fragment id="fake" name="fake" type="fake"/>
 
 </page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/page0.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_group/group/folder1/folder.metadata
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_group/group/folder1/page1.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_group/group/folder1/page1.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_group/group/folder1/page1.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_group/group/folder1/page1.psml Fri Dec 12 04:06:29 2008
@@ -17,12 +17,12 @@
 limitations under the License.
 -->
 
-<page id="_group-group-folder1-page1"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="_group-group-folder1-page1"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
-  <title>/folder1/page1.psml</title>
+  <title>/folder1/page1.psml</title>
   <fragment id="fake" name="fake" type="fake"/>
 
 </page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_group/group/folder1/page1.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_hostname/dash/_role/user/users-page.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_hostname/dash/_user/joe/home.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_hostname/dash/_user/joe/home.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_hostname/dash/_user/joe/home.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_hostname/dash/_user/joe/home.psml Fri Dec 12 04:06:29 2008
@@ -17,9 +17,9 @@
 limitations under the License.
 -->
 
-<page id="page0"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="page0"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
   <title>/page0.psml</title>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_hostname/dash/_user/joe/home.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role0/page2.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role0/page2.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role0/page2.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role0/page2.psml Fri Dec 12 04:06:29 2008
@@ -17,12 +17,12 @@
 limitations under the License.
 -->
 
-<page id="_role-role0-page2"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="_role-role0-page2"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
-  <title>/page2.psml</title>
+  <title>/page2.psml</title>
   <fragment id="fake" name="fake" type="fake"/>
 
 </page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role0/page2.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role1/page2.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role1/page2.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role1/page2.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role1/page2.psml Fri Dec 12 04:06:29 2008
@@ -17,12 +17,12 @@
 limitations under the License.
 -->
 
-<page id="_role-role1-page2"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="_role-role1-page2"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
-  <title>/page2.psml</title>
+  <title>/page2.psml</title>
   <fragment id="fake" name="fake" type="fake"/>
 
 </page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role1/page2.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/_mediatype/html/page2.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/_mediatype/html/page2.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/_mediatype/html/page2.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/_mediatype/html/page2.psml Fri Dec 12 04:06:29 2008
@@ -17,12 +17,12 @@
 limitations under the License.
 -->
 
-<page id="_user-user-_mediatype-html-page2"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="_user-user-_mediatype-html-page2"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
-  <title>/page2.psml</title>
+  <title>/page2.psml</title>
   <fragment id="fake" name="fake" type="fake"/>
 
 </page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/_mediatype/html/page2.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/folder.metadata
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/folder1/page0.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/folder1/page0.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/folder1/page0.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/folder1/page0.psml Fri Dec 12 04:06:29 2008
@@ -17,12 +17,12 @@
 limitations under the License.
 -->
 
-<page id="_user-user-folder1-page0"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="_user-user-folder1-page0"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
-  <title>/folder1/page0.psml</title>
+  <title>/folder1/page0.psml</title>
   <fragment id="fake" name="fake" type="fake"/>
 
 </page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/folder1/page0.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/page2.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder.metadata
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder0/folder.metadata
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder0/page0.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/folder.metadata
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/page0.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/page0.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/page0.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/page0.psml Fri Dec 12 04:06:29 2008
@@ -17,12 +17,12 @@
 limitations under the License.
 -->
 
-<page id="folder-page0"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="folder-page0"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
-  <title>/folder1/page0.psml</title>
+  <title>/folder1/page0.psml</title>
   <fragment id="fake" name="fake" type="fake"/>
 
 </page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/page0.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page0.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page0.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page0.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page0.psml Fri Dec 12 04:06:29 2008
@@ -17,9 +17,9 @@
 limitations under the License.
 -->
 
-<page id="page0"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="page0"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
   <title>/page0.psml</title>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page0.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page1.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page1.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page1.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page1.psml Fri Dec 12 04:06:29 2008
@@ -17,12 +17,12 @@
 limitations under the License.
 -->
 
-<page id="page1"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="page1"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
-  <title>/page1.psml</title>
+  <title>/page1.psml</title>
   <fragment id="fake" name="fake" type="fake"/>
 
 </page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page1.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page2.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page2.psml?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page2.psml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page2.psml Fri Dec 12 04:06:29 2008
@@ -16,12 +16,12 @@
 limitations under the License.
 -->
 
-<page id="page2"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<page id="page2"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
-  <title>/page2.psml</title>
+  <title>/page2.psml</title>
   <fragment id="fake" name="fake" type="fake"/>
 
 </page>

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page2.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/AdminUtil.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/AdminUtil.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/AdminUtil.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/AdminUtil.java Fri Dec 12 04:06:29 2008
@@ -1,112 +1,112 @@
-/*
+/*
  * 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.
- */
-package org.apache.jetspeed.administration;
-
-import java.util.ArrayList;
-
-import javax.servlet.jsp.JspException;
-
-import org.apache.jetspeed.om.folder.Folder;
-import org.apache.taglibs.random.RandomStrg;
-
-/**
- * Helper for admininstration
- * 
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @author <a href="mailto:chris@bluesunrise.com">Chris Schaefer</a>
- * @version $Id: $
- */
-public class AdminUtil
-{
-    /** the list of characters from which a password can be generatored. */
-    protected static final char[] PASS_CHARS = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-        'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-        'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-        '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
-        // removed these for aesthetic purposes
-        //'!', '&',  '-', '_', '=',
-        // '*','@', '#', '$', '%', '^',
-        //'+',
-
-    public String generatePassword()
-    {
-        RandomStrg rs = new RandomStrg();
-        
-        //TODO put in a more secure random number provider
-        //rs.setAlgorithm();   -- ideally call this for super security.  need rnd provider
-        
-        try
-        {
-            rs.generateRandomObject();
-        } catch (JspException e)
-        {
-            // this would only get thrown if we tried a secure random and the provider
-            // was not available.
-            e.printStackTrace();
-        }
-        rs.setLength(new Integer(12));
-        rs.setSingle(PASS_CHARS,PASS_CHARS.length);
-        ArrayList upper = new ArrayList();
-        ArrayList lower = new ArrayList();
-        //upper.add(new Character('A'));
-        //lower.add(new Character('B'));
-        rs.setRanges(upper,lower);
-        String retval = rs.getRandom();
-        
-        return retval;        
-    }
-    
-    protected String concatenatePaths(String base, String path)
-    {
-        String result = "";
-        if (base == null)
-        {
-            if (path == null)
-            {
-                return result;
-            }
-            return path;
-        }
-        else
-        {
-            if (path == null)
-            {
-                return base;
-            }
-        }
-        if (base.endsWith(Folder.PATH_SEPARATOR)) 
-        {
-            if (path.startsWith(Folder.PATH_SEPARATOR))
-            {
-                result = base.concat(path.substring(1));
-                return result;
-            }
-        
-        }
-        else
-        {
-            if (!path.startsWith(Folder.PATH_SEPARATOR)) 
-            {
-                result = base.concat(Folder.PATH_SEPARATOR).concat(path);
-                return result;
-            }
-        }
-        return base.concat(path);
-    }
-    
-}
+ * 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.
+ */
+package org.apache.jetspeed.administration;
+
+import java.util.ArrayList;
+
+import javax.servlet.jsp.JspException;
+
+import org.apache.jetspeed.om.folder.Folder;
+import org.apache.taglibs.random.RandomStrg;
+
+/**
+ * Helper for admininstration
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @author <a href="mailto:chris@bluesunrise.com">Chris Schaefer</a>
+ * @version $Id: $
+ */
+public class AdminUtil
+{
+    /** the list of characters from which a password can be generatored. */
+    protected static final char[] PASS_CHARS = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+        'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+        'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+        '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
+        // removed these for aesthetic purposes
+        //'!', '&',  '-', '_', '=',
+        // '*','@', '#', '$', '%', '^',
+        //'+',
+
+    public String generatePassword()
+    {
+        RandomStrg rs = new RandomStrg();
+        
+        //TODO put in a more secure random number provider
+        //rs.setAlgorithm();   -- ideally call this for super security.  need rnd provider
+        
+        try
+        {
+            rs.generateRandomObject();
+        } catch (JspException e)
+        {
+            // this would only get thrown if we tried a secure random and the provider
+            // was not available.
+            e.printStackTrace();
+        }
+        rs.setLength(new Integer(12));
+        rs.setSingle(PASS_CHARS,PASS_CHARS.length);
+        ArrayList upper = new ArrayList();
+        ArrayList lower = new ArrayList();
+        //upper.add(new Character('A'));
+        //lower.add(new Character('B'));
+        rs.setRanges(upper,lower);
+        String retval = rs.getRandom();
+        
+        return retval;        
+    }
+    
+    protected String concatenatePaths(String base, String path)
+    {
+        String result = "";
+        if (base == null)
+        {
+            if (path == null)
+            {
+                return result;
+            }
+            return path;
+        }
+        else
+        {
+            if (path == null)
+            {
+                return base;
+            }
+        }
+        if (base.endsWith(Folder.PATH_SEPARATOR)) 
+        {
+            if (path.startsWith(Folder.PATH_SEPARATOR))
+            {
+                result = base.concat(path.substring(1));
+                return result;
+            }
+        
+        }
+        else
+        {
+            if (!path.startsWith(Folder.PATH_SEPARATOR)) 
+            {
+                result = base.concat(Folder.PATH_SEPARATOR).concat(path);
+                return result;
+            }
+        }
+        return base.concat(path);
+    }
+    
+}

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/administration/AdminUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
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