You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ke...@apache.org on 2010/07/16 22:22:21 UTC
svn commit: r964937 - in /incubator/oodt/trunk: ./ webapp/filemgr/
webapp/filemgr/src/main/resources/ webapp/filemgr/src/main/webapp/
webapp/filemgr/src/main/webapp/WEB-INF/
webapp/filemgr/src/main/webapp/WEB-INF/classes/
webapp/filemgr/src/main/webapp...
Author: kelly
Date: Fri Jul 16 20:22:21 2010
New Revision: 964937
URL: http://svn.apache.org/viewvc?rev=964937&view=rev
Log:
WIP OODT-15 OODT-16
1. Update modules in toplevel pom: -webapp/fmprod, -webapp/workflow
2. "webapp/filemgr" now functional.
3. In "webapp/filemgr": add std ignores; replace Caltech notices with ASF notices; add missing XML PI decls; replace gov.nasa.jpl with org.apache in parameter names & imports; adjust dependencies and use relative path to oodt-core.
Modified:
incubator/oodt/trunk/pom.xml
incubator/oodt/trunk/webapp/filemgr/ (props changed)
incubator/oodt/trunk/webapp/filemgr/pom.xml
incubator/oodt/trunk/webapp/filemgr/src/main/resources/filemgr-webapp-tomcat-5.5.9.xml
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/WEB-INF/classes/logging.properties
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/WEB-INF/web.xml
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/findProduct.jsp
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/findProductsByType.jsp
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/getCurrentTransfers.jsp
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/inc/footer.jsp
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/inc/header.jsp
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/index.jsp
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/js/filemgr.js
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/productMetadata.jsp
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/productReferences.jsp
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewProduct.jsp
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewRecentProducts.jsp
incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewTransfer.jsp
Modified: incubator/oodt/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pom.xml?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/pom.xml (original)
+++ incubator/oodt/trunk/pom.xml Fri Jul 16 20:22:21 2010
@@ -55,8 +55,8 @@ the License.
<module>profile</module>
<!-- broken: <module>query</module> -->
<module>webapp/filemgr</module>
- <module>webapp/fmprod</module>
- <module>webapp/workflow</module>
+ <!-- broken: <module>webapp/fmprod</module> -->
+ <!-- broken: <module>webapp/workflow</module> -->
<!-- broken: <module>app/fmbrowser</module> -->
</modules>
</project>
Propchange: incubator/oodt/trunk/webapp/filemgr/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 20:22:21 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target
Modified: incubator/oodt/trunk/webapp/filemgr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/pom.xml?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/pom.xml (original)
+++ incubator/oodt/trunk/webapp/filemgr/pom.xml Fri Jul 16 20:22:21 2010
@@ -1,9 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?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.
+-->
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>gov.nasa.jpl.oodt</groupId>
+ <groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>2.0</version>
+ <version>${oodt.version}</version>
+ <relativePath>../../core/pom.xml</relativePath>
</parent>
<packaging>war</packaging>
<artifactId>cas-fm-webapp</artifactId>
@@ -38,24 +56,19 @@
<version>2.3</version>
</dependency>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
- <artifactId>cas-commons</artifactId>
- <version>1.0.0-dev</version>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
- <groupId>oodt</groupId>
- <artifactId>edm-commons</artifactId>
- <version>2.2.10</version>
- </dependency>
- <dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
+ <groupId>org.apache.oodt</groupId>
<artifactId>cas-metadata</artifactId>
- <version>1.4.0</version>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
- <groupId>oodt</groupId>
- <artifactId>cas-filemgr</artifactId>
- <version>1.6.0-dev</version>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>filemgr</artifactId>
+ <version>1.9.0-dev</version>
</dependency>
<dependency>
<groupId>xmlrpc</groupId>
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/resources/filemgr-webapp-tomcat-5.5.9.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/resources/filemgr-webapp-tomcat-5.5.9.xml?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/resources/filemgr-webapp-tomcat-5.5.9.xml (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/resources/filemgr-webapp-tomcat-5.5.9.xml Fri Jul 16 20:22:21 2010
@@ -1,18 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
<!--
- // Copyright (c) 2005, California Institute of Technology.
-// ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-//
-// $Id$
+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.
-->
-
- <Context path="/filemgr" docBase="/path/to/filemgr-webapp.war"
+<Context path="/filemgr" docBase="/path/to/filemgr-webapp.war"
debug="5" reloadable="true" crossContext="true">
<Valve className="org.apache.catalina.valves.AccessLogValve"
prefix="filemgr_access_log." suffix=".txt"
pattern="common"/>
- <Parameter name="gov.nasa.jpl.oodt.cas.filemgr.webapp.display.name" value="File Manager"/>
+ <Parameter name="org.apache.oodt.cas.filemgr.webapp.display.name" value="File Manager"/>
<Parameter name="filemgr.url" value="http://localhost:9000" override="false"/>
</Context>
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/WEB-INF/classes/logging.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/WEB-INF/classes/logging.properties?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/WEB-INF/classes/logging.properties (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/WEB-INF/classes/logging.properties Fri Jul 16 20:22:21 2010
@@ -1,7 +1,17 @@
-# Copyright (c) 2005, California Institute of Technology.
-# ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-#
-# $Id$
+# 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.
handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
@@ -15,4 +25,4 @@ org.apache.juli.FileHandler.directory =
org.apache.juli.FileHandler.prefix = filemgr.webapp.
java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
\ No newline at end of file
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/WEB-INF/web.xml?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/WEB-INF/web.xml Fri Jul 16 20:22:21 2010
@@ -1,9 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
- // Copyright (c) 2005, California Institute of Technology.
- // ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
- //
- // $Id$
+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 web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/findProduct.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/findProduct.jsp?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/findProduct.jsp (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/findProduct.jsp Fri Jul 16 20:22:21 2010
@@ -1,17 +1,27 @@
<!--
-Copyright (c) 2005, California Institute of Technology.
-ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-$Id$
+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.
-->
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"
import="java.util.Iterator" import="java.net.URL"
import="java.net.MalformedURLException" import="java.util.List"
import="java.util.Collections" import="java.util.Comparator"
- import="gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.Product"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType"
+ import="org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
+ import="org.apache.oodt.cas.filemgr.structs.Product"
+ import="org.apache.oodt.cas.filemgr.structs.ProductType"
%>
@@ -107,4 +117,4 @@ $Id$
%>
-<jsp:include page="inc/footer.jsp" />
\ No newline at end of file
+<jsp:include page="inc/footer.jsp" />
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/findProductsByType.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/findProductsByType.jsp?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/findProductsByType.jsp (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/findProductsByType.jsp Fri Jul 16 20:22:21 2010
@@ -1,21 +1,31 @@
<!--
-Copyright (c) 2005, California Institute of Technology.
-ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-$Id$
+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.
-->
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.Product"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.ProductPage"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.Element"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.TermQueryCriteria"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.Query"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.CatalogException"
- import="gov.nasa.jpl.oodt.cas.metadata.Metadata"
- import="gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
- import="gov.nasa.jpl.oodt.cas.commons.pagination.PaginationUtils"
+ import="org.apache.oodt.cas.filemgr.structs.Product"
+ import="org.apache.oodt.cas.filemgr.structs.ProductPage"
+ import="org.apache.oodt.cas.filemgr.structs.ProductType"
+ import="org.apache.oodt.cas.filemgr.structs.Element"
+ import="org.apache.oodt.cas.filemgr.structs.TermQueryCriteria"
+ import="org.apache.oodt.cas.filemgr.structs.Query"
+ import="org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException"
+ import="org.apache.oodt.cas.metadata.Metadata"
+ import="org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
+ import="org.apache.oodt.cas.commons.pagination.PaginationUtils"
import="java.net.URL"
import="java.net.MalformedURLException"
import="java.util.Iterator"
@@ -292,4 +302,4 @@ session.setAttribute("productQuery", nul
%>
-<jsp:include page="inc/footer.jsp" />
\ No newline at end of file
+<jsp:include page="inc/footer.jsp" />
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/getCurrentTransfers.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/getCurrentTransfers.jsp?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/getCurrentTransfers.jsp (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/getCurrentTransfers.jsp Fri Jul 16 20:22:21 2010
@@ -1,14 +1,24 @@
<!--
-Copyright (c) 2005, California Institute of Technology.
-ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-$Id$
+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.
-->
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"
- import="gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.FileTransferStatus"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.DataTransferException"
+ import="org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
+ import="org.apache.oodt.cas.filemgr.structs.FileTransferStatus"
+ import="org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException"
import="java.util.List"
import="java.text.NumberFormat"
import="java.net.URL"
@@ -91,4 +101,4 @@ $Id$
%>
-<jsp:include page="inc/footer.jsp" />
\ No newline at end of file
+<jsp:include page="inc/footer.jsp" />
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/inc/footer.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/inc/footer.jsp?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/inc/footer.jsp (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/inc/footer.jsp Fri Jul 16 20:22:21 2010
@@ -1,5 +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.
+-->
<!-- end main content -->
<%if(request.getParameter("showNavigation") == null || (request.getParameter("showNavigation") != null && !request.getParameter("showNavigation").equals("false"))){ %>
<p> </p>
@@ -19,9 +33,9 @@
<%if(request.getParameter("showCopyright") == null || (request.getParameter("showCopyright") != null && !request.getParameter("showCopyright").equals("false"))){ %>
<div align="center">
- <p>Copyright © 2006 California Institute of Technology.</p>
+ <p>Copyright © 2006 Apache Software Foundation.</p>
</div>
<%} %>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/inc/header.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/inc/header.jsp?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/inc/header.jsp (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/inc/header.jsp Fri Jul 16 20:22:21 2010
@@ -1,8 +1,18 @@
<!--
-Copyright (c) 2005, California Institute of Technology.
-ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+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
-$Id$
+ 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 language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"
@@ -20,4 +30,4 @@ $Id$
</head>
<body>
-<!-- begin main content -->
\ No newline at end of file
+<!-- begin main content -->
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/index.jsp?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/index.jsp (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/index.jsp Fri Jul 16 20:22:21 2010
@@ -1,20 +1,30 @@
<!--
-Copyright (c) 2005, California Institute of Technology.
-ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+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
-$Id$
+ 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 language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<jsp:include page="inc/header.jsp"/>
- <h3>Welcome to the <%= application.getInitParameter("gov.nasa.jpl.oodt.cas.filemgr.webapp.display.name") %>!</h3>
+ <h3>Welcome to the <%= application.getInitParameter("org.apache.oodt.cas.filemgr.webapp.display.name") %>!</h3>
<p>You can:
<ul>
- <li><a href="./findProduct.jsp">Browse for a product in the file manager</a>.</li>
+ <li><a href="./findProduct.jsp">Browse for a product in the file manager</a>.</li>
<li><a href="./freeTextFindProduct.jsp">Find a product using a free text query</a>.</li>
<li><a href="./viewRecentProducts.jsp">View recent products in the file manager.</a></li>
<li><a href="./getCurrentTransfers.jsp">View current transfers to the file manager.</a></li>
@@ -22,4 +32,4 @@ $Id$
<jsp:include page="inc/footer.jsp">
<jsp:param name="showNavigation" value="false"/>
-</jsp:include>
\ No newline at end of file
+</jsp:include>
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/js/filemgr.js
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/js/filemgr.js?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/js/filemgr.js (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/js/filemgr.js Fri Jul 16 20:22:21 2010
@@ -1,10 +1,19 @@
-//Copyright (c) 2005, California Institute of Technology.
-//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+// 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
//
-//$Id$
-
+// 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.
function popWin(url)
{
window.open(url,'_newWin','scrollbars=yes,resizable=yes,menubar=0,status=no,width=525,height=450,top=100,left=200');
-}
\ No newline at end of file
+}
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/productMetadata.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/productMetadata.jsp?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/productMetadata.jsp (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/productMetadata.jsp Fri Jul 16 20:22:21 2010
@@ -1,17 +1,27 @@
<!--
-Copyright (c) 2005, California Institute of Technology.
-ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+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
-$Id$
+ 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 language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"
import="java.util.List" import="java.util.Iterator"
import="java.net.URL" import="java.net.MalformedURLException"
- import="gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.Product"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType"
- import="gov.nasa.jpl.oodt.cas.metadata.Metadata"
+ import="org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
+ import="org.apache.oodt.cas.filemgr.structs.Product"
+ import="org.apache.oodt.cas.filemgr.structs.ProductType"
+ import="org.apache.oodt.cas.metadata.Metadata"
%>
<jsp:include page="inc/header.jsp"/>
@@ -96,4 +106,4 @@ $Id$
<jsp:include page="inc/footer.jsp">
<jsp:param name="showNavigation" value="false"/>
<jsp:param name="showCopyright" value="false"/>
-</jsp:include>
\ No newline at end of file
+</jsp:include>
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/productReferences.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/productReferences.jsp?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/productReferences.jsp (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/productReferences.jsp Fri Jul 16 20:22:21 2010
@@ -1,18 +1,28 @@
<!--
-Copyright (c) 2005, California Institute of Technology.
-ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+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
-$Id$
+ 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 language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"
import="java.util.List" import="java.util.Iterator"
import="java.net.URI" import="java.io.File"
import="java.net.URL" import="java.net.MalformedURLException"
- import="gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.Reference"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.Product"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType"
+ import="org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
+ import="org.apache.oodt.cas.filemgr.structs.Reference"
+ import="org.apache.oodt.cas.filemgr.structs.Product"
+ import="org.apache.oodt.cas.filemgr.structs.ProductType"
import="java.text.NumberFormat"
%>
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewProduct.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewProduct.jsp?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewProduct.jsp (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewProduct.jsp Fri Jul 16 20:22:21 2010
@@ -1,8 +1,18 @@
<!--
-Copyright (c) 2005, California Institute of Technology.
-ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
+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
-$Id$
+ 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 language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"
@@ -10,11 +20,11 @@ $Id$
import="java.text.NumberFormat"
import="java.net.URL" import="java.net.MalformedURLException"
import="java.io.File" import="java.net.URI"
- import="gov.nasa.jpl.oodt.cas.metadata.Metadata"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.Product"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.Reference"
- import="gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
+ import="org.apache.oodt.cas.metadata.Metadata"
+ import="org.apache.oodt.cas.filemgr.structs.Product"
+ import="org.apache.oodt.cas.filemgr.structs.ProductType"
+ import="org.apache.oodt.cas.filemgr.structs.Reference"
+ import="org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
%>
<jsp:include page="inc/header.jsp"/>
@@ -155,4 +165,4 @@ $Id$
%>
-<jsp:include page="inc/footer.jsp"/>
\ No newline at end of file
+<jsp:include page="inc/footer.jsp"/>
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewRecentProducts.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewRecentProducts.jsp?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewRecentProducts.jsp (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewRecentProducts.jsp Fri Jul 16 20:22:21 2010
@@ -1,13 +1,23 @@
<!--
-Copyright (c) 2005, California Institute of Technology.
-ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-$Id$
+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.
-->
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"
- import="gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.ProductType"
+ import="org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
+ import="org.apache.oodt.cas.filemgr.structs.ProductType"
import="java.util.List"
import="java.net.URL"
import="java.net.MalformedURLException"
@@ -85,4 +95,4 @@ $Id$
<%} %>
-<jsp:include page="inc/footer.jsp" />
\ No newline at end of file
+<jsp:include page="inc/footer.jsp" />
Modified: incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewTransfer.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewTransfer.jsp?rev=964937&r1=964936&r2=964937&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewTransfer.jsp (original)
+++ incubator/oodt/trunk/webapp/filemgr/src/main/webapp/viewTransfer.jsp Fri Jul 16 20:22:21 2010
@@ -1,15 +1,25 @@
<!--
-Copyright (c) 2005, California Institute of Technology.
-ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-
-$Id$
+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.
-->
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"
- import="gov.nasa.jpl.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.FileTransferStatus"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.Reference"
- import="gov.nasa.jpl.oodt.cas.filemgr.structs.exceptions.DataTransferException"
+ import="org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient"
+ import="org.apache.oodt.cas.filemgr.structs.FileTransferStatus"
+ import="org.apache.oodt.cas.filemgr.structs.Reference"
+ import="org.apache.oodt.cas.filemgr.structs.exceptions.DataTransferException"
import="java.util.List"
import="java.text.NumberFormat"
import="java.net.URL"
@@ -81,4 +91,4 @@ $Id$
%>
-<jsp:include page="inc/footer.jsp" />
\ No newline at end of file
+<jsp:include page="inc/footer.jsp" />