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 23:38:04 UTC
svn commit: r964958 - in /incubator/oodt/trunk: ./ webapp/workflow/
webapp/workflow/src/main/resources/ webapp/workflow/src/main/webapp/
webapp/workflow/src/main/webapp/WEB-INF/
webapp/workflow/src/main/webapp/WEB-INF/classes/ webapp/workflow/src/main/...
Author: kelly
Date: Fri Jul 16 21:38:04 2010
New Revision: 964958
URL: http://svn.apache.org/viewvc?rev=964958&view=rev
Log:
WIP OODT-15 OODT-16
"webapp/workflow" is now functional; add std ignores; replace Caltech notices with ASF notices; replace gov.nasa.jpl with org.apache in XML config files; add FIXME notice re ns uri; repl tab w/space; change enc from iso-8859-1 to utf-8; add asf notice wher emissing; remove Caltech notices from 3rd party JavaScripts progressBar & prototype; update dependencies to oodt-specific artifacts and add parent pom relative path.
Modified:
incubator/oodt/trunk/pom.xml
incubator/oodt/trunk/webapp/workflow/ (props changed)
incubator/oodt/trunk/webapp/workflow/pom.xml
incubator/oodt/trunk/webapp/workflow/src/main/resources/workflow-instance-met.xml
incubator/oodt/trunk/webapp/workflow/src/main/resources/workflow-webapp-tomcat-5.5.9.xml
incubator/oodt/trunk/webapp/workflow/src/main/webapp/WEB-INF/classes/logging.properties
incubator/oodt/trunk/webapp/workflow/src/main/webapp/WEB-INF/web.xml
incubator/oodt/trunk/webapp/workflow/src/main/webapp/inc/footer.jsp
incubator/oodt/trunk/webapp/workflow/src/main/webapp/inc/header.jsp
incubator/oodt/trunk/webapp/workflow/src/main/webapp/index.jsp
incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/progress/progress.js
incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/prototype/prototype.js
incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/workflow.js
incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewCondition.jsp
incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewEventToWorkflowMap.jsp
incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewTask.jsp
incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflow.jsp
incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflowInstances.jsp
incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflows.jsp
Modified: incubator/oodt/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/pom.xml?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/pom.xml (original)
+++ incubator/oodt/trunk/pom.xml Fri Jul 16 21:38:04 2010
@@ -55,7 +55,7 @@ the License.
<module>profile</module>
<module>webapp/filemgr</module>
<module>webapp/fmprod</module>
- <!-- broken: <module>webapp/workflow</module> -->
+ <module>webapp/workflow</module>
<!-- broken: <module>app/fmbrowser</module> -->
</modules>
</project>
Propchange: incubator/oodt/trunk/webapp/workflow/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 16 21:38:04 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target
Modified: incubator/oodt/trunk/webapp/workflow/pom.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/pom.xml?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/pom.xml (original)
+++ incubator/oodt/trunk/webapp/workflow/pom.xml Fri Jul 16 21:38:04 2010
@@ -1,10 +1,27 @@
<?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-wm-webapp</artifactId>
@@ -50,19 +67,19 @@
<version>2.3</version>
</dependency>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
- <artifactId>cas-commons</artifactId>
- <version>1.0.0</version>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-commons</artifactId>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
+ <groupId>org.apache.oodt</groupId>
<artifactId>cas-metadata</artifactId>
- <version>1.5.0</version>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
- <groupId>gov.nasa.jpl.oodt</groupId>
- <artifactId>cas-workflow</artifactId>
- <version>1.6.0-dev</version>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>workflow</artifactId>
+ <version>${oodt.version}</version>
</dependency>
<dependency>
<groupId>xmlrpc</groupId>
Modified: incubator/oodt/trunk/webapp/workflow/src/main/resources/workflow-instance-met.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/resources/workflow-instance-met.xml?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/resources/workflow-instance-met.xml (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/resources/workflow-instance-met.xml Fri Jul 16 21:38:04 2010
@@ -1,11 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2008, 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.
-->
+<!-- FIXME: Adjust namespace URI? -->
<cas:winstfields xmlns:cas="http://oodt.jpl.nasa.gov/1.0/cas">
<default>
<field name="WorkflowInstId"/>
@@ -20,4 +30,4 @@
<field name="WorkflowInstId"/>
<field name="ProcessingNode"/>
</workflow>
-</cas:winstfields>
\ No newline at end of file
+</cas:winstfields>
Modified: incubator/oodt/trunk/webapp/workflow/src/main/resources/workflow-webapp-tomcat-5.5.9.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/resources/workflow-webapp-tomcat-5.5.9.xml?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/resources/workflow-webapp-tomcat-5.5.9.xml (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/resources/workflow-webapp-tomcat-5.5.9.xml Fri Jul 16 21:38:04 2010
@@ -1,33 +1,43 @@
+<?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="/workflow" docBase="/path/to/workflow-webapp.war"
debug="5" reloadable="true" crossContext="true">
<Valve className="org.apache.catalina.valves.AccessLogValve"
prefix="workflow_access_log." suffix=".txt" pattern="common" />
- <Parameter name="gov.nasa.jpl.oodt.cas.workflow.webapp.display.name"
+ <Parameter name="org.apache.oodt.cas.workflow.webapp.display.name"
value="Workflow Manager Monitor" override="false" />
- <Parameter name="gov.nasa.jpl.oodt.cas.workflow.webapp.mgr.url"
+ <Parameter name="org.apache.oodt.cas.workflow.webapp.mgr.url"
value="http://localhost:9001" override="false" />
<Parameter
- name="gov.nasa.jpl.oodt.cas.workflow.webapp.inst.metFields.filePath" value="/path/to/workflow-instance-met.xml"
+ name="org.apache.oodt.cas.workflow.webapp.inst.metFields.filePath" value="/path/to/workflow-instance-met.xml"
override="false" />
<Parameter
- name="gov.nasa.jpl.oodt.cas.workflow.inst.statuses"
+ name="org.apache.oodt.cas.workflow.inst.statuses"
value="QUEUED,RSUBMIT,STARTED,FINISHED,PAUSED,METMISS"
override="false"/>
<Parameter
- name="gov.nasa.jpl.oodt.cas.workflow.webapp.lifecycleFilePath"
+ name="org.apache.oodt.cas.workflow.webapp.lifecycleFilePath"
value="/path/to/workflow-lifecycle.xml"
override="false"/>
Modified: incubator/oodt/trunk/webapp/workflow/src/main/webapp/WEB-INF/classes/logging.properties
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/WEB-INF/classes/logging.properties?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/WEB-INF/classes/logging.properties (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/WEB-INF/classes/logging.properties Fri Jul 16 21:38:04 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 = workflow.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/workflow/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/WEB-INF/web.xml?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/WEB-INF/web.xml Fri Jul 16 21:38:04 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"
@@ -12,8 +22,8 @@
<web-app>
<!--
<context-param>
- <param-name>gov.nasa.jpl.oodt.cas.filemgr.webapp.datastore.factory</param-name>
- <param-value>gov.nasa.jpl.oodt.cas.data.DataSourceDataStoreFactory</param-value>
+ <param-name>org.apache.oodt.cas.filemgr.webapp.datastore.factory</param-name>
+ <param-value>org.apache.oodt.cas.data.DataSourceDataStoreFactory</param-value>
</context-param>-->
<resource-ref>
Modified: incubator/oodt/trunk/webapp/workflow/src/main/webapp/inc/footer.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/inc/footer.jsp?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/inc/footer.jsp (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/inc/footer.jsp Fri Jul 16 21:38:04 2010
@@ -1,26 +1,40 @@
+<%--
+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>
-<p> </p>
-<p> </p>
-
-<table border="1" align="center">
- <tr>
- <td><a href="./index.jsp">Home</a></td>
- <td><a href="./viewWorkflowInstances.jsp">View Workflow Instances</a></td>
- <td><a href="./viewWorkflows.jsp">View Workflow Descriptions</a></td>
- <td><a href="./viewEventToWorkflowMap.jsp">View Event Workflow Map</a></td>
- </tr>
-</table>
-<%} %>
-
-<%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>
-</div>
-<%} %>
+<%if(request.getParameter("showNavigation") == null || (request.getParameter("showNavigation") != null && !request.getParameter("showNavigation").equals("false"))){ %>
+<p> </p>
+<p> </p>
+<p> </p>
+
+<table border="1" align="center">
+ <tr>
+ <td><a href="./index.jsp">Home</a></td>
+ <td><a href="./viewWorkflowInstances.jsp">View Workflow Instances</a></td>
+ <td><a href="./viewWorkflows.jsp">View Workflow Descriptions</a></td>
+ <td><a href="./viewEventToWorkflowMap.jsp">View Event Workflow Map</a></td>
+ </tr>
+</table>
+<%} %>
+
+<%if(request.getParameter("showCopyright") == null || (request.getParameter("showCopyright") != null && !request.getParameter("showCopyright").equals("false"))){ %>
+<div align="center">
+ <p>Copyright © 2010 Apache Software Foundation.</p>
+</div>
+<%} %>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: incubator/oodt/trunk/webapp/workflow/src/main/webapp/inc/header.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/inc/header.jsp?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/inc/header.jsp (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/inc/header.jsp Fri Jul 16 21:38:04 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"
@@ -28,4 +38,4 @@ $Id$
</head>
<body>
-<!-- begin main content -->
\ No newline at end of file
+<!-- begin main content -->
Modified: incubator/oodt/trunk/webapp/workflow/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/index.jsp?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/index.jsp (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/index.jsp Fri Jul 16 21:38:04 2010
@@ -1,15 +1,25 @@
<!--
-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.workflow.webapp.display.name") %>!</h3>
+ <h3>Welcome to the <%= application.getInitParameter("org.apache.oodt.cas.workflow.webapp.display.name") %>!</h3>
<p>You can:
@@ -19,6 +29,6 @@ $Id$
<li><a href="./viewEventToWorkflowMap.jsp">View what Workflows are associated with different Events</a></li>
</ul>
-<jsp:include page="inc/footer.jsp">
- <jsp:param name="showNavigation" value="false"/>
-</jsp:include>
\ No newline at end of file
+<jsp:include page="inc/footer.jsp">
+ <jsp:param name="showNavigation" value="false"/>
+</jsp:include>
Modified: incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/progress/progress.js
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/progress/progress.js?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/progress/progress.js (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/progress/progress.js Fri Jul 16 21:38:04 2010
@@ -1,124 +1,119 @@
-//Copyright (c) 2008, California Institute of Technology.
-//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-//
-//$Id$
-
-/* WebAppers Progress Bar, version 0.2
-* (c) 2007 Ray Cheung
-*
-* WebAppers Progress Bar is freely distributable under the terms of an Creative Commons license.
-* For details, see the WebAppers web site: http://wwww.Webappers.com/
-*
-/*--------------------------------------------------------------------------*/
-
-var initial = -120;
-var imageWidth=240;
-var eachPercent = (imageWidth/2)/100;
-/************************************************************\
-*
-\************************************************************/
-function setText (id, percent)
-{
- $(id+'Text').innerHTML = percent+"%";
-}
-/************************************************************\
-*
-\************************************************************/
-function display ( id, percentage,color )
-{
- if (typeof color == "undefined") {
- color = "1";
- }
- var percentageWidth = eachPercent * percentage;
- var actualWidth = initial + percentageWidth ;
- document.write('<img id="'+id+'" src="images/percent/percentImage.png" alt="'+percentage+'%" class="percentImage'+color+'" style="background-position: '+actualWidth+'px 0pt;"/> <span id="'+id+'Text">'+percentage+'%</span>');
-}
-/************************************************************\
-*
-\************************************************************/
-function emptyProgress(id)
-{
- var newProgress = initial+'px';
- $(id).style.backgroundPosition=newProgress+' 0';
- setText(id,'0');
-}
-/************************************************************\
-*
-\************************************************************/
-function getProgress(id)
-{
- var nowWidth = $(id).style.backgroundPosition.split("px");
- return (Math.floor(100+(nowWidth[0]/eachPercent))+'%');
-
-}
-/************************************************************\
-*
-\************************************************************/
-function setProgress(id, percentage)
-{
- var percentageWidth = eachPercent * percentage;
- var newProgress = eval(initial)+eval(percentageWidth)+'px';
- $(id).style.backgroundPosition=newProgress+' 0';
- setText(id,percentage);
-}
-/************************************************************\
-*
-\************************************************************/
-function plus ( id, percentage )
-{
- var nowWidth = $(id).style.backgroundPosition.split("px");
- var nowPercent = Math.floor(100+(nowWidth[0]/eachPercent))+eval(percentage);
- var percentageWidth = eachPercent * percentage;
- var actualWidth = eval(nowWidth[0]) + eval(percentageWidth);
- var newProgress = actualWidth+'px';
- if(actualWidth>=0 && percentage <100)
- {
- var newProgress = 1+'px';
- $(id).style.backgroundPosition=newProgress+' 0';
- setText(id,100);
- alert('full');
- }
- else
- {
- $(id).style.backgroundPosition=newProgress+' 0';
- setText(id,nowPercent);
- }
-}
-/************************************************************\
-*
-\************************************************************/
-function minus ( id, percentage )
-{
- var nowWidth = $(id).style.backgroundPosition.split("px");
- var nowPercent = Math.floor(100+(nowWidth[0]/eachPercent))-eval(percentage);
- var percentageWidth = eachPercent * percentage;
- var actualWidth = eval(nowWidth[0]) - eval(percentageWidth);
- var newProgress = actualWidth+'px';
- if(actualWidth<=-120)
- {
- var newProgress = -120+'px';
- $(id).style.backgroundPosition=newProgress+' 0';
- setText(id,0);
- alert('empty');
- }
- else
- {
- $(id).style.backgroundPosition=newProgress+' 0';
- setText(id,nowPercent);
- }
-}
-/************************************************************\
-*
-\************************************************************/
-function fillProgress(id, endPercent)
-{
- var nowWidth = $(id).style.backgroundPosition.split("px");
- startPercent = Math.ceil(100+(nowWidth[0]/eachPercent))+1;
- var actualWidth = initial + (eachPercent * endPercent);
- if (startPercent <= endPercent && nowWidth[0] <= actualWidth)
- {
- plus(id,'1');
- setText(id,startPercent);
- setTimeout("fillProgress('"+id+"',"+endPercent+")",10);
- }
-}
\ No newline at end of file
+/* WebAppers Progress Bar, version 0.2
+* (c) 2007 Ray Cheung
+*
+* WebAppers Progress Bar is freely distributable under the terms of an Creative Commons license.
+* For details, see the WebAppers web site: http://www.webappers.com/progressBar/
+*
+/*--------------------------------------------------------------------------*/
+
+var initial = -120;
+var imageWidth=240;
+var eachPercent = (imageWidth/2)/100;
+/************************************************************\
+*
+\************************************************************/
+function setText (id, percent)
+{
+ $(id+'Text').innerHTML = percent+"%";
+}
+/************************************************************\
+*
+\************************************************************/
+function display ( id, percentage,color )
+{
+ if (typeof color == "undefined") {
+ color = "1";
+ }
+ var percentageWidth = eachPercent * percentage;
+ var actualWidth = initial + percentageWidth ;
+ document.write('<img id="'+id+'" src="images/percent/percentImage.png" alt="'+percentage+'%" class="percentImage'+color+'" style="background-position: '+actualWidth+'px 0pt;"/> <span id="'+id+'Text">'+percentage+'%</span>');
+}
+/************************************************************\
+*
+\************************************************************/
+function emptyProgress(id)
+{
+ var newProgress = initial+'px';
+ $(id).style.backgroundPosition=newProgress+' 0';
+ setText(id,'0');
+}
+/************************************************************\
+*
+\************************************************************/
+function getProgress(id)
+{
+ var nowWidth = $(id).style.backgroundPosition.split("px");
+ return (Math.floor(100+(nowWidth[0]/eachPercent))+'%');
+
+}
+/************************************************************\
+*
+\************************************************************/
+function setProgress(id, percentage)
+{
+ var percentageWidth = eachPercent * percentage;
+ var newProgress = eval(initial)+eval(percentageWidth)+'px';
+ $(id).style.backgroundPosition=newProgress+' 0';
+ setText(id,percentage);
+}
+/************************************************************\
+*
+\************************************************************/
+function plus ( id, percentage )
+{
+ var nowWidth = $(id).style.backgroundPosition.split("px");
+ var nowPercent = Math.floor(100+(nowWidth[0]/eachPercent))+eval(percentage);
+ var percentageWidth = eachPercent * percentage;
+ var actualWidth = eval(nowWidth[0]) + eval(percentageWidth);
+ var newProgress = actualWidth+'px';
+ if(actualWidth>=0 && percentage <100)
+ {
+ var newProgress = 1+'px';
+ $(id).style.backgroundPosition=newProgress+' 0';
+ setText(id,100);
+ alert('full');
+ }
+ else
+ {
+ $(id).style.backgroundPosition=newProgress+' 0';
+ setText(id,nowPercent);
+ }
+}
+/************************************************************\
+*
+\************************************************************/
+function minus ( id, percentage )
+{
+ var nowWidth = $(id).style.backgroundPosition.split("px");
+ var nowPercent = Math.floor(100+(nowWidth[0]/eachPercent))-eval(percentage);
+ var percentageWidth = eachPercent * percentage;
+ var actualWidth = eval(nowWidth[0]) - eval(percentageWidth);
+ var newProgress = actualWidth+'px';
+ if(actualWidth<=-120)
+ {
+ var newProgress = -120+'px';
+ $(id).style.backgroundPosition=newProgress+' 0';
+ setText(id,0);
+ alert('empty');
+ }
+ else
+ {
+ $(id).style.backgroundPosition=newProgress+' 0';
+ setText(id,nowPercent);
+ }
+}
+/************************************************************\
+*
+\************************************************************/
+function fillProgress(id, endPercent)
+{
+ var nowWidth = $(id).style.backgroundPosition.split("px");
+ startPercent = Math.ceil(100+(nowWidth[0]/eachPercent))+1;
+ var actualWidth = initial + (eachPercent * endPercent);
+ if (startPercent <= endPercent && nowWidth[0] <= actualWidth)
+ {
+ plus(id,'1');
+ setText(id,startPercent);
+ setTimeout("fillProgress('"+id+"',"+endPercent+")",10);
+ }
+}
Modified: incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/prototype/prototype.js
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/prototype/prototype.js?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/prototype/prototype.js (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/prototype/prototype.js Fri Jul 16 21:38:04 2010
@@ -1,8 +1,3 @@
-//Copyright (c) 2008, California Institute of Technology.
-//ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.
-//
-//$Id$
-
/* Prototype JavaScript framework, version 1.5.0
* (c) 2005-2007 Sam Stephenson
*
@@ -2517,4 +2512,4 @@ if (/Konqueror|Safari|KHTML/.test(naviga
}
}
-Element.addMethods();
\ No newline at end of file
+Element.addMethods();
Modified: incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/workflow.js
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/workflow.js?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/workflow.js (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/js/workflow.js Fri Jul 16 21:38:04 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, name)
{
window.open(url, name ,'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/workflow/src/main/webapp/viewCondition.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewCondition.jsp?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewCondition.jsp (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewCondition.jsp Fri Jul 16 21:38:04 2010
@@ -1,63 +1,73 @@
<!--
-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="gov.nasa.jpl.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.Workflow"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowCondition"
+ import="org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
+ import="org.apache.oodt.cas.workflow.structs.Workflow"
+ import="org.apache.oodt.cas.workflow.structs.WorkflowCondition"
%>
-<jsp:include page="inc/header.jsp"/>
-
+<jsp:include page="inc/header.jsp"/>
+
<%
- String workflowMgrUrl = application.getInitParameter("gov.nasa.jpl.oodt.cas.workflow.webapp.mgr.url");
+ String workflowMgrUrl = application.getInitParameter("org.apache.oodt.cas.workflow.webapp.mgr.url");
XmlRpcWorkflowManagerClient client = new XmlRpcWorkflowManagerClient(new URL(workflowMgrUrl));
- WorkflowCondition condition = null;
- String conditionId = request.getParameter("conditionId");
-
-
- if(conditionId != null){
- try{
- condition = client.getConditionById(conditionId);
-
- if(condition != null){
-
- %>
- <table>
- <tr>
- <td>Condition ID</td>
- <td><%=condition.getConditionId() %></td>
- </tr>
- <tr>
- <td>Name</td>
- <td><%=condition.getConditionName() %></td>
- </tr>
- <tr>
- <td>Implementation Class</td>
- <td><%=condition.getConditionInstanceClassName() %></td>
- </tr>
- </table>
- <%
- }
-
- }
- catch(Exception e){
- e.printStackTrace();
- }
+ WorkflowCondition condition = null;
+ String conditionId = request.getParameter("conditionId");
+
+
+ if(conditionId != null){
+ try{
+ condition = client.getConditionById(conditionId);
+
+ if(condition != null){
+
+ %>
+ <table>
+ <tr>
+ <td>Condition ID</td>
+ <td><%=condition.getConditionId() %></td>
+ </tr>
+ <tr>
+ <td>Name</td>
+ <td><%=condition.getConditionName() %></td>
+ </tr>
+ <tr>
+ <td>Implementation Class</td>
+ <td><%=condition.getConditionInstanceClassName() %></td>
+ </tr>
+ </table>
+ <%
+ }
+
+ }
+ catch(Exception e){
+ e.printStackTrace();
+ }
}
%>
-<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 page="inc/footer.jsp">
+ <jsp:param name="showNavigation" value="false"/>
+ <jsp:param name="showCopyright" value="false"/>
+</jsp:include>
Modified: incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewEventToWorkflowMap.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewEventToWorkflowMap.jsp?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewEventToWorkflowMap.jsp (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewEventToWorkflowMap.jsp Fri Jul 16 21:38:04 2010
@@ -1,34 +1,44 @@
<!--
-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="gov.nasa.jpl.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.Workflow"
+ import="org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
+ import="org.apache.oodt.cas.workflow.structs.Workflow"
%>
<jsp:include page="inc/header.jsp"/>
<%
- String workflowMgrUrl = application.getInitParameter("gov.nasa.jpl.oodt.cas.workflow.webapp.mgr.url");
+ String workflowMgrUrl = application.getInitParameter("org.apache.oodt.cas.workflow.webapp.mgr.url");
XmlRpcWorkflowManagerClient client = new XmlRpcWorkflowManagerClient(new URL(workflowMgrUrl));
- List events = null;
+ List events = null;
String eventName = request.getParameter("event_name");
try{
events = client.getRegisteredEvents();
if(events != null){
- %>
- <h3>Event to Workflow Map</h3>
- <p>Select an event, and then click on "Get Workflows" to obtain a list of workflows associated
- with the selected event.</p>
-
+ %>
+ <h3>Event to Workflow Map</h3>
+ <p>Select an event, and then click on "Get Workflows" to obtain a list of workflows associated
+ with the selected event.</p>
+
<form method="POST" action="./viewEventToWorkflowMap.jsp" name="f1" id="f1">
<table>
<tr>
@@ -46,53 +56,53 @@ $Id$
%>
</select>
- </td>
+ </td>
<td><input type="submit" name="getWorflows" value="Get Worfklows!"></td>
</tr>
- </table>
- </form>
-
+ </table>
+ </form>
+
<%
- }
-
-
- if(eventName != null){
- List workflows = client.getWorkflowsByEvent(eventName);
-
- %>
- <hr>
- <h4>Workflows for <%=eventName %> event</h4>
-
- <table>
- <tr>
- <td>Workflow</td>
- </tr>
- <%
-
- for(Iterator i = workflows.iterator(); i.hasNext(); ){
- Workflow w = (Workflow)i.next();
-
- %>
- <tr>
- <td><a href="javascript:popWin('./viewWorkflow.jsp?workflowId=<%=w.getId() %>', '<%=w.getId() %>');"><%=w.getName() %></a></td>
- </tr>
+ }
+
+
+ if(eventName != null){
+ List workflows = client.getWorkflowsByEvent(eventName);
+
+ %>
+ <hr>
+ <h4>Workflows for <%=eventName %> event</h4>
+
+ <table>
+ <tr>
+ <td>Workflow</td>
+ </tr>
+ <%
+
+ for(Iterator i = workflows.iterator(); i.hasNext(); ){
+ Workflow w = (Workflow)i.next();
+
+ %>
+ <tr>
+ <td><a href="javascript:popWin('./viewWorkflow.jsp?workflowId=<%=w.getId() %>', '<%=w.getId() %>');"><%=w.getName() %></a></td>
+ </tr>
<%
- }
-
- %>
- </table>
+ }
+
+ %>
+ </table>
<%
- }
- %>
-
+ }
+ %>
+
<%
}
catch(Exception e){
e.printStackTrace();
- }
+ }
%>
-<jsp:include page="inc/footer.jsp"/>
\ No newline at end of file
+<jsp:include page="inc/footer.jsp"/>
Modified: incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewTask.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewTask.jsp?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewTask.jsp (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewTask.jsp Fri Jul 16 21:38:04 2010
@@ -1,109 +1,119 @@
<!--
-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="gov.nasa.jpl.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.Workflow"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTask"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowCondition"
+ import="org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
+ import="org.apache.oodt.cas.workflow.structs.Workflow"
+ import="org.apache.oodt.cas.workflow.structs.WorkflowTask"
+ import="org.apache.oodt.cas.workflow.structs.WorkflowCondition"
%>
<jsp:include page="inc/header.jsp"/>
<%
- String workflowMgrUrl = application.getInitParameter("gov.nasa.jpl.oodt.cas.workflow.webapp.mgr.url");
+ String workflowMgrUrl = application.getInitParameter("org.apache.oodt.cas.workflow.webapp.mgr.url");
XmlRpcWorkflowManagerClient client = new XmlRpcWorkflowManagerClient(new URL(workflowMgrUrl));
- WorkflowTask task = null;
- String taskId = request.getParameter("taskId");
-
-
- if(taskId != null){
- try{
- task = client.getTaskById(taskId);
-
- if(task != null){
-
- %>
- <table>
- <tr>
- <td>Task ID</td>
- <td><%=task.getTaskId() %></td>
- </tr>
- <tr>
- <td>Name</td>
- <td><%=task.getTaskName() %></td>
- </tr>
- <tr>
- <td>Implementation Class</td>
- <td><%=task.getTaskInstanceClassName() %></td>
- </tr>
- <tr>
- <td>Configuration</td>
- <td>
- <table>
- <tr>
- <td>Property</td>
- <td>Value</td>
- </tr>
- <%
- for(Iterator i = task.getTaskConfig().getProperties().keySet().iterator(); i.hasNext(); ){
- String propName = (String)i.next();
- String propValue = (String)task.getTaskConfig().getProperties().get(propName);
-
- %>
- <tr>
- <td><%=propName %></td>
- <td><%=propValue %></td>
- </tr>
- <%
-
- }
- %>
- </table>
- </td>
- </tr>
- <tr>
- <td>Conditions</td>
- <td>
- <table>
- <%
- for(Iterator i = task.getConditions().iterator(); i.hasNext(); ){
- WorkflowCondition c = (WorkflowCondition)i.next();
-
- %>
- <tr>
- <td><a href="javascript:popWin('./viewCondition.jsp?conditionId=<%=c.getConditionId()%>', '<%=c.getConditionId() %>');"><%=c.getConditionName() %></a></td>
- </tr>
+ WorkflowTask task = null;
+ String taskId = request.getParameter("taskId");
+
+
+ if(taskId != null){
+ try{
+ task = client.getTaskById(taskId);
+
+ if(task != null){
+
+ %>
+ <table>
+ <tr>
+ <td>Task ID</td>
+ <td><%=task.getTaskId() %></td>
+ </tr>
+ <tr>
+ <td>Name</td>
+ <td><%=task.getTaskName() %></td>
+ </tr>
+ <tr>
+ <td>Implementation Class</td>
+ <td><%=task.getTaskInstanceClassName() %></td>
+ </tr>
+ <tr>
+ <td>Configuration</td>
+ <td>
+ <table>
+ <tr>
+ <td>Property</td>
+ <td>Value</td>
+ </tr>
+ <%
+ for(Iterator i = task.getTaskConfig().getProperties().keySet().iterator(); i.hasNext(); ){
+ String propName = (String)i.next();
+ String propValue = (String)task.getTaskConfig().getProperties().get(propName);
+
+ %>
+ <tr>
+ <td><%=propName %></td>
+ <td><%=propValue %></td>
+ </tr>
+ <%
+
+ }
+ %>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td>Conditions</td>
+ <td>
+ <table>
+ <%
+ for(Iterator i = task.getConditions().iterator(); i.hasNext(); ){
+ WorkflowCondition c = (WorkflowCondition)i.next();
+
+ %>
+ <tr>
+ <td><a href="javascript:popWin('./viewCondition.jsp?conditionId=<%=c.getConditionId()%>', '<%=c.getConditionId() %>');"><%=c.getConditionName() %></a></td>
+ </tr>
<%
- }
-
- %>
-
-
- </table>
- </td>
- </tr>
- </table>
- <%
- }
-
- }
- catch(Exception e){
- e.printStackTrace();
- }
+ }
+
+ %>
+
+
+ </table>
+ </td>
+ </tr>
+ </table>
+ <%
+ }
+
+ }
+ catch(Exception e){
+ e.printStackTrace();
+ }
}
%>
-<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 page="inc/footer.jsp">
+ <jsp:param name="showNavigation" value="false"/>
+ <jsp:param name="showCopyright" value="false"/>
+</jsp:include>
Modified: incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflow.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflow.jsp?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflow.jsp (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflow.jsp Fri Jul 16 21:38:04 2010
@@ -1,43 +1,53 @@
<!--
-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.Iterator"
import="java.net.URL"
- import="gov.nasa.jpl.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.Workflow"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTask"
- import="gov.nasa.jpl.oodt.cas.workflow.webapp.util.JspUtility"
+ import="org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
+ import="org.apache.oodt.cas.workflow.structs.Workflow"
+ import="org.apache.oodt.cas.workflow.structs.WorkflowTask"
+ import="org.apache.oodt.cas.workflow.webapp.util.JspUtility"
%>
<jsp:include page="inc/header.jsp"/>
<%
- String workflowMgrUrl = application.getInitParameter("gov.nasa.jpl.oodt.cas.workflow.webapp.mgr.url");
+ String workflowMgrUrl = application.getInitParameter("org.apache.oodt.cas.workflow.webapp.mgr.url");
XmlRpcWorkflowManagerClient client = new XmlRpcWorkflowManagerClient(new URL(workflowMgrUrl));
- Workflow workflow = null;
- String workflowId = request.getParameter("workflowId");
-
-
- if(workflowId != null){
- try{
- workflow = client.getWorkflowById(workflowId);
-
- if(workflow != null){
-
- %>
- <table>
- <tr>
- <td>Workflow ID</td>
- <td><%=workflow.getId() %></td>
- </tr>
- <tr>
- <td>Name</td>
- <td><%=workflow.getName() %></td>
+ Workflow workflow = null;
+ String workflowId = request.getParameter("workflowId");
+
+
+ if(workflowId != null){
+ try{
+ workflow = client.getWorkflowById(workflowId);
+
+ if(workflow != null){
+
+ %>
+ <table>
+ <tr>
+ <td>Workflow ID</td>
+ <td><%=workflow.getId() %></td>
+ </tr>
+ <tr>
+ <td>Name</td>
+ <td><%=workflow.getName() %></td>
</tr>
<tr>
<td colspan="2">
@@ -62,22 +72,22 @@ $Id$
</table>
</td>
- </tr>
- </table>
- <%
- }
-
- }
- catch(Exception e){
- e.printStackTrace();
- }
+ </tr>
+ </table>
+ <%
+ }
+
+ }
+ catch(Exception e){
+ e.printStackTrace();
+ }
}
%>
-<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 page="inc/footer.jsp">
+ <jsp:param name="showNavigation" value="false"/>
+ <jsp:param name="showCopyright" value="false"/>
+</jsp:include>
Modified: incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflowInstances.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflowInstances.jsp?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflowInstances.jsp (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflowInstances.jsp Fri Jul 16 21:38:04 2010
@@ -1,33 +1,43 @@
<!--
-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.text.NumberFormat"
- import="gov.nasa.jpl.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstance"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTask"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowStatus"
- import="gov.nasa.jpl.oodt.cas.metadata.Metadata"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowInstancePage"
- import="gov.nasa.jpl.oodt.cas.workflow.webapp.util.WorkflowInstanceMetMap"
- import="gov.nasa.jpl.oodt.cas.workflow.webapp.util.WorkflowInstanceMetadataReader"
- import="gov.nasa.jpl.oodt.cas.workflow.webapp.util.JspUtility"
- import="gov.nasa.jpl.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager"%>
+ import="org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
+ import="org.apache.oodt.cas.workflow.structs.WorkflowInstance"
+ import="org.apache.oodt.cas.workflow.structs.WorkflowTask"
+ import="org.apache.oodt.cas.workflow.structs.WorkflowStatus"
+ import="org.apache.oodt.cas.metadata.Metadata"
+ import="org.apache.oodt.cas.workflow.structs.WorkflowInstancePage"
+ import="org.apache.oodt.cas.workflow.webapp.util.WorkflowInstanceMetMap"
+ import="org.apache.oodt.cas.workflow.webapp.util.WorkflowInstanceMetadataReader"
+ import="org.apache.oodt.cas.workflow.webapp.util.JspUtility"
+ import="org.apache.oodt.cas.workflow.lifecycle.WorkflowLifecycleManager"%>
<jsp:include page="inc/header.jsp">
<jsp:param name="metaRefresh" value="30"/>
</jsp:include>
<%
- String workflowMgrUrl = application.getInitParameter("gov.nasa.jpl.oodt.cas.workflow.webapp.mgr.url");
+ String workflowMgrUrl = application.getInitParameter("org.apache.oodt.cas.workflow.webapp.mgr.url");
XmlRpcWorkflowManagerClient client = new XmlRpcWorkflowManagerClient(new URL(workflowMgrUrl));
WorkflowLifecycleManager lifecycleMgr =
- new WorkflowLifecycleManager(application.getInitParameter("gov.nasa.jpl.oodt.cas.workflow.webapp.lifecycleFilePath"));
+ new WorkflowLifecycleManager(application.getInitParameter("org.apache.oodt.cas.workflow.webapp.lifecycleFilePath"));
WorkflowInstancePage instPage = null;
int pageSize = 20;
@@ -70,7 +80,7 @@ $Id$
%>
<p>Filter Workflows by Status:<br> |
<%
- String statusListStr = application.getInitParameter("gov.nasa.jpl.oodt.cas.workflow.inst.statuses");
+ String statusListStr = application.getInitParameter("org.apache.oodt.cas.workflow.inst.statuses");
if(statusListStr == null){
statusListStr = "STARTED, FINISHED, METMISS, PAUSED"; /* default statuses */
}
@@ -90,7 +100,7 @@ $Id$
<%
if(instPage.getPageWorkflows() != null && instPage.getPageWorkflows().size() > 0){
- String metMapFilePath = application.getInitParameter("gov.nasa.jpl.oodt.cas.workflow.webapp.inst.metFields.filePath");
+ String metMapFilePath = application.getInitParameter("org.apache.oodt.cas.workflow.webapp.inst.metFields.filePath");
WorkflowInstanceMetMap wInstMetMap = WorkflowInstanceMetadataReader.parseMetMapFile(metMapFilePath);
@@ -212,4 +222,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/workflow/src/main/webapp/viewWorkflows.jsp
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflows.jsp?rev=964958&r1=964957&r2=964958&view=diff
==============================================================================
--- incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflows.jsp (original)
+++ incubator/oodt/trunk/webapp/workflow/src/main/webapp/viewWorkflows.jsp Fri Jul 16 21:38:04 2010
@@ -1,21 +1,31 @@
<!--
-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="gov.nasa.jpl.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.Workflow"
- import="gov.nasa.jpl.oodt.cas.workflow.structs.WorkflowTask"
+ import="org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient"
+ import="org.apache.oodt.cas.workflow.structs.Workflow"
+ import="org.apache.oodt.cas.workflow.structs.WorkflowTask"
%>
<jsp:include page="inc/header.jsp"/>
<%
- String workflowMgrUrl = application.getInitParameter("gov.nasa.jpl.oodt.cas.workflow.webapp.mgr.url");
+ String workflowMgrUrl = application.getInitParameter("org.apache.oodt.cas.workflow.webapp.mgr.url");
XmlRpcWorkflowManagerClient client = new XmlRpcWorkflowManagerClient(new URL(workflowMgrUrl));
List workflows = null;
@@ -63,4 +73,4 @@ $Id$
%>
-<jsp:include page="inc/footer.jsp"/>
\ No newline at end of file
+<jsp:include page="inc/footer.jsp"/>