Author: ate
Date: Wed May 20 22:12:50 2009
New Revision: 776882
URL: http://svn.apache.org/viewvc?rev=776882&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1018: cleanup of jsr-286 tck test
configurations
Added:
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/tck-jsr286-psml.zip (with
props)
Removed:
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/JetspeedTCKJSR286ConfigGenerator.class
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/pages/
Modified:
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/JetspeedTCKJSR286ConfigGenerator.java
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/jetspeedTestsToURLMapping.xml
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/readme.txt
Modified:
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/JetspeedTCKJSR286ConfigGenerator.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/JetspeedTCKJSR286ConfigGenerator.java?rev=776882&r1=776881&r2=776882&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/JetspeedTCKJSR286ConfigGenerator.java
(original)
+++
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/JetspeedTCKJSR286ConfigGenerator.java
Wed May 20 22:12:50 2009
@@ -31,6 +31,23 @@
*/
public class JetspeedTCKJSR286ConfigGenerator
{
+ private static String xmlHeader = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n"
+ + "<!--\n"
+ + " Licensed to the Apache Software
Foundation (ASF) under one or more\n"
+ + " contributor license agreements.
See the NOTICE file distributed with\n"
+ + " this work for additional
information regarding copyright ownership.\n"
+ + " The ASF licenses this file to You
under the Apache License, Version 2.0\n"
+ + " (the \"License\"); you may not use
this file except in compliance with\n"
+ + " the License. You may obtain a copy
of the License at\n"
+ + "\n"
+ + "
http://www.apache.org/licenses/LICENSE-2.0\n";
+ + "\n"
+ + " Unless required by applicable law
or agreed to in writing, software\n"
+ + " distributed under the License is
distributed on an \"AS IS\" BASIS,\n"
+ + " WITHOUT WARRANTIES OR CONDITIONS OF
ANY KIND, either express or implied.\n"
+ + " See the License for the specific
language governing permissions and\n"
+ + " limitations under the License.\n"
+ + "-->\n";
private static String pageHeader = "<page>\n"
+ " <defaults
layout-decorator=\"simple\" portlet-decorator=\"clear\"/>\n"
+ " <title>TCK testcase {0} for test:
{1}</title>\n"
@@ -50,7 +67,9 @@
Document doc = db.parse(new File(tckTestsFile));
NodeList nodes =
doc.getDocumentElement().getElementsByTagName("test_case");
FileWriter urlMappingFile = new FileWriter(new
File("jetspeedTestsToURLMapping.xml"));
- urlMappingFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+
+
+ urlMappingFile.write(xmlHeader);
urlMappingFile.write("<test_case_urls
xmlns=\"http://java.sun.com/xml/ns/portlet/portletTCKVendor_1_0.xsd\"\n";);
urlMappingFile.write("
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";);
urlMappingFile.write("
xsi:schemaLocation=\"http://java.sun.com/xml/ns/portlet/portletTCKVendor_1_0.xsd\n";);
@@ -60,7 +79,7 @@
Element test_portlet;
FileWriter psmlFile;
String testName;
- new File("pages").mkdirs();
+ new File("tck-jsr286").mkdirs();
for (num = 0; num < nodes.getLength(); num++)
{
@@ -96,7 +115,8 @@
private FileWriter createTestPage(String testName, int num) throws
Exception
{
- FileWriter writer = new FileWriter(new File("pages/testcase" + num +
".psml"));
+ FileWriter writer = new FileWriter(new File("tck-jsr286/testcase" +
num + ".psml"));
+ writer.write(xmlHeader);
writer.write(MessageFormat.format(pageHeader, Integer.toString(num),
testName));
return writer;
}
Modified:
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/jetspeedTestsToURLMapping.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/jetspeedTestsToURLMapping.xml?rev=776882&r1=776881&r2=776882&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/jetspeedTestsToURLMapping.xml
(original)
+++
portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/jetspeedTestsToURLMapping.xml
Wed May 20 22:12:50 2009
@@ -1,4 +1,20 @@
<?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.
+-->
<test_case_urls
xmlns="http://java.sun.com/xml/ns/portlet/portletTCKVendor_1_0.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portletTCKVendor_1_0.xsd
Modified: portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/readme.txt
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/readme.txt?rev=776882&r1=776881&r2=776882&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/readme.txt (original)
+++ portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/readme.txt Wed May 20
22:12:50 2009
@@ -87,10 +87,9 @@
$TS_HOME/bin/tsant deploy.all
-Dwebapp.dir=$CATALINA_HOME/webapps/jetspeed/WEB-INF/deploy
- d) Copy the TCK test psml files to the jetspeed installation:
+ d) Unzip the TCK test psml files to the jetspeed installation:
- mkdir $CATALINA/HOME/webapps/jetspeed/WEB-INF/pages/tck-jsr286
- cp pages/*.psml $CATALINA_HOME/webapps/jetspeed/WEB-INF/pages/tck-jsr286/
+ unzip tck-jsr286-psml.zip $CATALINA/HOME/webapps/jetspeed/WEB-INF/pages/
e) Startup Jetspeed once to ensure the TCK portlet applications are deployed
Added: portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/tck-jsr286-psml.zip
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/tck-jsr286-psml.zip?rev=776882&view=auto
==============================================================================
Binary file - no diff available.
Propchange: portals/jetspeed-2/portal/trunk/etc/tck-jsr-286/tck-jsr286-psml.zip
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
