Author: mattmann
Date: Mon Sep 7 02:57:45 2015
New Revision: 1701537
URL: http://svn.apache.org/r1701537
Log:
Merge fix for OODT-871 Issues with OODT 0.10 RC#1 from 0.10 RC #2 branch.
Modified:
oodt/trunk/ (props changed)
oodt/trunk/CHANGES.txt
oodt/trunk/commons/src/test/java/org/apache/oodt/commons/io/DirectorySelectorTest.java
oodt/trunk/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
oodt/trunk/commons/src/test/resources/test.xml
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/solr/src/main/assembly/assembly.xml
oodt/trunk/profile/src/test/resources/org/apache/oodt/profile/test.xml
oodt/trunk/profile/src/test/resources/test.xml
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench_wicket.css
Propchange: oodt/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 7 02:57:45 2015
@@ -1,3 +1,5 @@
+/oodt/branches/0.10:1701304-1701536
/oodt/branches/0.8.1:1657924-1657925
+/oodt/tags/0.10-rc1:1700212-1701303
/oodt/tags/0.8.1:1655770-1657922
/oodt/tags/0.8.1-rc1:1657923
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Mon Sep 7 02:57:45 2015
@@ -2,6 +2,8 @@ Apache OODT Change Log
======================
Release 0.10 - 08/30/2015
+* OODT-871 Issues with OODT 0.10 RC#1 (lewismc, mattmann)
+
* OODT-246 Give user the ability to print a detailed report on what jobs in
the Resource Manager are running on what nodes (Gabe Resneck, mattmann)
Modified:
oodt/trunk/commons/src/test/java/org/apache/oodt/commons/io/DirectorySelectorTest.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/commons/src/test/java/org/apache/oodt/commons/io/DirectorySelectorTest.java?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
---
oodt/trunk/commons/src/test/java/org/apache/oodt/commons/io/DirectorySelectorTest.java
(original)
+++
oodt/trunk/commons/src/test/java/org/apache/oodt/commons/io/DirectorySelectorTest.java
Mon Sep 7 02:57:45 2015
@@ -1,3 +1,20 @@
+/**
+ * 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.oodt.commons.io;
import java.io.File;
Modified:
oodt/trunk/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
--- oodt/trunk/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
(original)
+++ oodt/trunk/commons/src/test/java/org/apache/oodt/commons/util/XMLTest.java
Mon Sep 7 02:57:45 2015
@@ -59,7 +59,7 @@ public class XMLTest extends TestCase {
String result = XML.serialize(doc);
crc.update(result.getBytes());
long value = crc.getValue();
- assertTrue("Stringified DOM document CRC mismatch, got value =
" + value, 3880488030L == value || 2435419114L == value || /* added by Chris
Mattmann: pretty print fix */3688328384L == value || /* other newline treatment
*/ 750262163L == value || 3738296466L == value /* Apache incubator warmed up
the file, so it suffered thermal expansion */);
+ assertTrue("Stringified DOM document CRC mismatch, got value =
" + value, 3880488030L == value || 2435419114L == value || /* added by Chris
Mattmann: pretty print fix */3688328384L == value || /* other newline treatment
*/ 750262163L == value || 3738296466L == value /* Apache incubator warmed up
the file, so it suffered thermal expansion */ || 1102069581L == value /*
lewismc and his ALv2 header. */);
}
/** Test the {@link XML#createSAXParser} method.
@@ -85,7 +85,7 @@ public class XMLTest extends TestCase {
java.util.zip.CRC32 crc = new java.util.zip.CRC32();
crc.update(stringWriter.getBuffer().toString().getBytes());
long value = crc.getValue();
- assertTrue("Dumped DOM tree CRC mismatch; got " + value, value
== 828793L || value == 2241317601L);
+ assertTrue("Dumped DOM tree CRC mismatch; got " + value, value
== 828793L || value == 2241317601L || value == 3208931170L /* lewismc and his
ALv2 header */);
}
/** Test the {@link XML#unwrappedText} method. */
Modified: oodt/trunk/commons/src/test/resources/test.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/commons/src/test/resources/test.xml?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
--- oodt/trunk/commons/src/test/resources/test.xml (original)
+++ oodt/trunk/commons/src/test/resources/test.xml Mon Sep 7 02:57:45 2015
@@ -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.txt 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.
+-->
<!DOCTYPE log [
<!ELEMENT log (stream*)>
<!ELEMENT stream (streamID, analyst, message*)>
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
Mon Sep 7 02:57:45 2015
@@ -1,5 +1,20 @@
@CHARSET "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.
+ */
html, body {
padding:0px;
margin:0px auto;
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
Mon Sep 7 02:57:45 2015
@@ -1,5 +1,20 @@
@CHARSET "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.
+ */
html, body {
padding:0px;
margin:0px auto;
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
Mon Sep 7 02:57:45 2015
@@ -1,4 +1,20 @@
+/*
+ * 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.
+ */
#login{
text-align: center;
display: block;
Modified:
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/solr/src/main/assembly/assembly.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/solr/src/main/assembly/assembly.xml?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
---
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/solr/src/main/assembly/assembly.xml
(original)
+++
oodt/trunk/mvn/archetypes/radix/src/main/resources/archetype-resources/solr/src/main/assembly/assembly.xml
Mon Sep 7 02:57:45 2015
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<assembly>
<id>bin</id>
<formats>
Modified: oodt/trunk/profile/src/test/resources/org/apache/oodt/profile/test.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/src/test/resources/org/apache/oodt/profile/test.xml?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
--- oodt/trunk/profile/src/test/resources/org/apache/oodt/profile/test.xml
(original)
+++ oodt/trunk/profile/src/test/resources/org/apache/oodt/profile/test.xml Mon
Sep 7 02:57:45 2015
@@ -1,6 +1,22 @@
<!-- DO NOT put the XML processing instruction or DOCTYPE decl in this -->
<!-- file! They're added by the unit test automatically. -->
<!-- $Id: test.xml,v 1.1.1.1 2004/03/02 20:53:39 kelly Exp $ -->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. See the NOTICE.txt 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.
+-->
<profile>
<profAttributes>
<profId>OODT_PDS_PROFILE_SERVER</profId>
Modified: oodt/trunk/profile/src/test/resources/test.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/profile/src/test/resources/test.xml?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
--- oodt/trunk/profile/src/test/resources/test.xml (original)
+++ oodt/trunk/profile/src/test/resources/test.xml Mon Sep 7 02:57:45 2015
@@ -1,6 +1,22 @@
<!-- DO NOT put the XML processing instruction or DOCTYPE decl in this -->
<!-- file! They're added by the unit test automatically. -->
<!-- $Id: test.xml,v 1.1.1.1 2004/03/02 20:53:39 kelly Exp $ -->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. See the NOTICE.txt 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.
+-->
<profile>
<profAttributes>
<profId>OODT_PDS_PROFILE_SERVER</profId>
Modified:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
---
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css
(original)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css
Mon Sep 7 02:57:45 2015
@@ -1,4 +1,19 @@
-/* file tree */
+/*
+ * 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.
+ */
UL.fileTree {
font-family: Verdana, sans-serif;
font-size: 11px;
Modified:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
---
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
(original)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
Mon Sep 7 02:57:45 2015
@@ -1,4 +1,19 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. See the NOTICE.txt 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.
+-->
<wicket:panel>
<wicket:link>
<link type="text/css" rel="stylesheet" href="Workbench_wicket.css"/>
Modified:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench_wicket.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench_wicket.css?rev=1701537&r1=1701536&r2=1701537&view=diff
==============================================================================
---
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench_wicket.css
(original)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench_wicket.css
Mon Sep 7 02:57:45 2015
@@ -1,7 +1,19 @@
-/* file tree */
-
-
-
+/*
+ * 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.
+ */
UL.fileTree {
font-family: Verdana, sans-serif;
font-size: 11px;
