portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r725995 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/min-pages/ applications/jetspeed/src/main/webapp/WEB-INF/pages/ applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/ appl...
Date Fri, 12 Dec 2008 13:12:55 GMT
Author: ate
Date: Fri Dec 12 05:12:53 2008
New Revision: 725995

URL: http://svn.apache.org/viewvc?rev=725995&view=rev
Log:
Some more svn:eol-style property fixing for previously missed extensions: link|security|xslt|dtd|TXT
Also removed incorrectly set binary mime-type from some of these

Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Jetspeed2.link
  (props changed)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Jetspeed2Wiki.link
  (props changed)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/apache.link
  (props changed)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/apache_portals.link
  (props changed)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/page.security
  (props changed)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/tigris.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/pdf.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/src/test/resources/default.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/test/resources/templates/email/html/en/entest.vm
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/test/resources/templates/email/html/htmltest.vm
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/test/resources/templates/email/test.vm
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/stripIds.xslt
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/sub1/apache_portals.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/apache_portals.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder.metadata
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/Jetspeed2.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/Jetspeed2Wiki.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/apache.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/apache_portals.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/default-page.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/folder.metadata
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/test001.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/subsites/apache_portals.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/test001.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/skin_testcase.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/skin_testcase2.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/skin_testcase3.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/skin_testcase4.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/testcase.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/testcaseMarshall.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/testcase_securityref.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/testsecurity.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/user/anon/html/default.psml
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/link0.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_group/group/link0.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/link0.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/link1.link
  (contents, props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page.security
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/testdata/pages/pages/page.security
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/web-app_2_3.dtd
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/domino/setup2/README.TXT
  (props changed)
    portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/openldap/setup1/README.TXT
  (props changed)
    portals/jetspeed-2/portal/trunk/etc/schema/merge.xslt   (contents, props changed)
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/repository.dtd
  (props changed)

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Jetspeed2.link
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Jetspeed2Wiki.link
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/apache.link
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/apache_portals.link
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/page.security
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/tigris.link
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/tigris.link?rev=725995&r1=725994&r2=725995&view=diff
==============================================================================
Binary files - no diff available.

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/tigris.link
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/tigris.link
            ('svn:mime-type' removed)

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/pdf.link
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/pdf.link?rev=725995&r1=725994&r2=725995&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/pdf.link
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/pdf.link
Fri Dec 12 05:12:53 2008
@@ -1,24 +1,24 @@
-<?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.
--->
-<link target="parent"
-    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/link.xsd">
- <title>PDF Portlet</title>
- <url>http://localhost:8080/jetspeed/fileserver/_content/sample_pdf.pdf</url>
-</link>
+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.
+-->
+<link target="parent"
+    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/link.xsd">
+ <title>PDF Portlet</title>
+ <url>http://localhost:8080/jetspeed/fileserver/_content/sample_pdf.pdf</url>
+</link>

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/pdf.link
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout-help.vm
            ('svn:mime-type' removed)

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/src/test/resources/default.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-file-cache/src/test/resources/default.psml
            ('svn:mime-type' removed)

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/test/resources/templates/email/html/en/entest.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/test/resources/templates/email/html/en/entest.vm
            ('svn:mime-type' removed)

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/test/resources/templates/email/html/htmltest.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/test/resources/templates/email/html/htmltest.vm
            ('svn:mime-type' removed)

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/test/resources/templates/email/test.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-locator/src/test/resources/templates/email/test.vm
            ('svn:mime-type' removed)

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/resources/stripIds.xslt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/sub1/apache_portals.link
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/sub1/apache_portals.link?rev=725995&r1=725994&r2=725995&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/sub1/apache_portals.link
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/_role/role1/sub1/apache_portals.link
Fri Dec 12 05:12:53 2008
@@ -1,23 +1,23 @@
-<?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.
--->
-<link target="top" skin="test-skin"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+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.
+-->
+<link target="top" skin="test-skin"
+    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/link.xsd">
  <title>Apache Portals Website</title>
  <url>http://portals.apache.org</url>

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/apache_portals.link
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/apache_portals.link?rev=725995&r1=725994&r2=725995&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/apache_portals.link
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/apache_portals.link
Fri Dec 12 05:12:53 2008
@@ -1,23 +1,23 @@
-<?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.
--->
-<link target="top" skin="test-skin"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+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.
+-->
+<link target="top" skin="test-skin"
+    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/link.xsd">
  <title>Apache Portals Website</title>
  <url>http://portals.apache.org</url>

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

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder.metadata
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/Jetspeed2.link
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/Jetspeed2.link
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/Jetspeed2Wiki.link
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/Jetspeed2Wiki.link
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/apache.link
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/apache.link
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/apache_portals.link
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/apache_portals.link
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/default-page.psml
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/folder.metadata
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/folder1/folder3/test001.psml
            ('svn:mime-type' removed)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/subsites/apache_portals.link
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/subsites/apache_portals.link?rev=725995&r1=725994&r2=725995&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/subsites/apache_portals.link
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/subsites/apache_portals.link
Fri Dec 12 05:12:53 2008
@@ -1,23 +1,23 @@
-<?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.
--->
-<link target="top" skin="test-skin"
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+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.
+-->
+<link target="top" skin="test-skin"
+    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/link.xsd">
  <title>Apache Portals Website</title>
  <url>http://portals.apache.org</url>

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

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/pages/test001.psml
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/skin_testcase.psml
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/skin_testcase2.psml
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/skin_testcase3.psml
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/skin_testcase4.psml
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/testcase.psml
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/testcaseMarshall.psml
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/testcase_securityref.psml
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/test/testsecurity.psml
            ('svn:mime-type' removed)

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/testdata/psml/user/anon/html/default.psml
            ('svn:mime-type' removed)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/link0.link
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/link0.link?rev=725995&r1=725994&r2=725995&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/link0.link
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/__subsite-root/link0.link
Fri Dec 12 05:12:53 2008
@@ -17,8 +17,8 @@
 limitations under the License.
 -->
 
-<link xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<link 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/link.xsd">
 
   <title>/link0.link</title>

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_group/group/link0.link
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_group/group/link0.link?rev=725995&r1=725994&r2=725995&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_group/group/link0.link
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_group/group/link0.link
Fri Dec 12 05:12:53 2008
@@ -16,9 +16,9 @@
 limitations under the License.
 -->
 
-<link
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<link
+    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/link.xsd">
 
   <title>/link0.link</title>

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/link0.link
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/link0.link?rev=725995&r1=725994&r2=725995&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/link0.link
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/link0.link
Fri Dec 12 05:12:53 2008
@@ -17,8 +17,8 @@
 limitations under the License.
 -->
 
-<link xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<link 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/link.xsd">
 
   <title>/link0.link</title>

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

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/link1.link
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/link1.link?rev=725995&r1=725994&r2=725995&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/link1.link
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/link1.link
Fri Dec 12 05:12:53 2008
@@ -17,9 +17,9 @@
 limitations under the License.
 -->
 
-<link target="top" 
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<link target="top" 
+    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/link.xsd">
 
   <title>/link1.link</title>

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

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

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

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/web-app_2_3.dtd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/descriptor/web-app_2_3.dtd
            ('svn:mime-type' removed)

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/domino/setup2/README.TXT
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/JETSPEED-INF/directory/config/openldap/setup1/README.TXT
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/schema/merge.xslt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/schema/merge.xslt?rev=725995&r1=725994&r2=725995&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/schema/merge.xslt (original)
+++ portals/jetspeed-2/portal/trunk/etc/schema/merge.xslt Fri Dec 12 05:12:53 2008
@@ -1,47 +1,47 @@
-<?xml version="1.0"?>
-<!--
+<?xml version="1.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.
--->
-<xslt:transform version="1.0"
-                 xmlns:xslt="http://www.w3.org/1999/XSL/Transform">
-<!-- Simple template to merge two database schemas into one  -->
-<xslt:param name="fileTwo" />
-<xslt:template match="/">
-
-   <xslt:message>
-      <xslt:text />Merging input with '<xslt:value-of select="$fileTwo"/>
-      <xslt:text>'</xslt:text>
-   </xslt:message>
-	<xslt:if test="string($fileTwo)=''">
-      <xslt:message terminate="yes">
-         <xslt:text>No input file specified (parameter 'fileTwo')</xslt:text>
-      </xslt:message>
-   </xslt:if>
-	<database name="generic">
-	<xslt:apply-templates />
-	</database>
-	</xslt:template>
-	<xslt:template match="database">
-      <xslt:apply-templates />
-      <xslt:apply-templates select="document($fileTwo)/database/table"/> 
-	</xslt:template>
-	
-	<xslt:template match="@*|node()">
-	<xslt:copy>
-      <xslt:apply-templates select="@*|node()"/>
-	</xslt:copy>
-	</xslt:template>
-</xslt:transform>
+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.
+-->
+<xslt:transform version="1.0"
+                 xmlns:xslt="http://www.w3.org/1999/XSL/Transform">
+<!-- Simple template to merge two database schemas into one  -->
+<xslt:param name="fileTwo" />
+<xslt:template match="/">
+
+   <xslt:message>
+      <xslt:text />Merging input with '<xslt:value-of select="$fileTwo"/>
+      <xslt:text>'</xslt:text>
+   </xslt:message>
+	<xslt:if test="string($fileTwo)=''">
+      <xslt:message terminate="yes">
+         <xslt:text>No input file specified (parameter 'fileTwo')</xslt:text>
+      </xslt:message>
+   </xslt:if>
+	<database name="generic">
+	<xslt:apply-templates />
+	</database>
+	</xslt:template>
+	<xslt:template match="database">
+      <xslt:apply-templates />
+      <xslt:apply-templates select="document($fileTwo)/database/table"/> 
+	</xslt:template>
+	
+	<xslt:template match="@*|node()">
+	<xslt:copy>
+      <xslt:apply-templates select="@*|node()"/>
+	</xslt:copy>
+	</xslt:template>
+</xslt:transform>

Propchange: portals/jetspeed-2/portal/trunk/etc/schema/merge.xslt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/repository.dtd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/db-ojb/repository.dtd
            ('svn:mime-type' removed)



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