Author: mattmann
Date: Sat Aug 22 22:29:42 2015
New Revision: 1697143
URL: http://svn.apache.org/r1697143
Log:
- move Workbench to OODT web components: OODT-842: WIP
Added:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/
- copied from r1697120,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/Workbench.css
- copied unchanged from r1697124,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/Workbench.css
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/Workbench.html
- copied unchanged from r1697142,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/Workbench.html
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/Workbench.java
- copied, changed from r1697142,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/Workbench.java
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/Workbench.js
- copied unchanged from r1697124,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/Workbench.js
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/Workbench_wicket.css
- copied unchanged from r1697142,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/Workbench_wicket.css
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/info.gif
- copied unchanged from r1697142,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/info.gif
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/jquery-1.3.2.js
- copied unchanged from r1697122,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/jquery-1.3.2.js
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/jquery-ui-1.7.2.full.min.js
- copied unchanged from r1697122,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/jquery-ui-1.7.2.full.min.js
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/jquery.alerts.css
- copied unchanged from r1697122,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/jquery.alerts.css
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/jquery.alerts.js
- copied unchanged from r1697122,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/jquery.alerts.js
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/jquery.periodicalupdater.js
- copied unchanged from r1697122,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/jquery.periodicalupdater.js
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/title.gif
- copied unchanged from r1697142,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/title.gif
Removed:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/FileTree.css
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/FileTree.java
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/FileTree_wicket.css
Modified:
oodt/trunk/curator/services/pom.xml
oodt/trunk/curator/webapp/pom.xml
oodt/trunk/webapp/components/pom.xml
Modified: oodt/trunk/curator/services/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/services/pom.xml?rev=1697143&r1=1697142&r2=1697143&view=diff
==============================================================================
--- oodt/trunk/curator/services/pom.xml (original)
+++ oodt/trunk/curator/services/pom.xml Sat Aug 22 22:29:42 2015
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.10-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>curator-services</artifactId>
Modified: oodt/trunk/curator/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/pom.xml?rev=1697143&r1=1697142&r2=1697143&view=diff
==============================================================================
--- oodt/trunk/curator/webapp/pom.xml (original)
+++ oodt/trunk/curator/webapp/pom.xml Sat Aug 22 22:29:42 2015
@@ -20,7 +20,7 @@ the License.
<parent>
<groupId>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>0.10-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-curator</artifactId>
@@ -157,11 +157,21 @@ the License.
<version>${project.parent.version}</version>
<type>war</type>
</dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>0.9.9-RC1</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-webapp-components</artifactId>
+ <version>${project.parent.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>cas-filemgr</artifactId>
+ <groupId>org.apache.oodt</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>cas-workflow</artifactId>
+ <groupId>org.apache.oodt</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</project>
Modified: oodt/trunk/webapp/components/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/pom.xml?rev=1697143&r1=1697142&r2=1697143&view=diff
==============================================================================
--- oodt/trunk/webapp/components/pom.xml (original)
+++ oodt/trunk/webapp/components/pom.xml Sat Aug 22 22:29:42 2015
@@ -24,10 +24,8 @@ the License.
<version>0.10-SNAPSHOT</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>
- <groupId>org.apache.oodt</groupId>
<artifactId>oodt-webapp-components</artifactId>
<packaging>jar</packaging>
- <version>0.10-SNAPSHOT</version>
<name>OODT Wicket Web Components</name>
<dependencies>
<dependency>
@@ -72,6 +70,11 @@ the License.
<version>4.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>0.9.9-RC1</version>
+ </dependency>
</dependencies>
<profiles>
<profile>
Copied:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/Workbench.java
(from r1697142,
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/Workbench.java)
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/Workbench.java?p2=oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/Workbench.java&p1=oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/Workbench.java&r1=1697142&r2=1697143&rev=1697143&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/Workbench.java
(original)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webpcomponents/curation/workbench/Workbench.java
Sat Aug 22 22:29:42 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.oodt.cas.curation.workbench;
+package org.apache.oodt.cas.webpcomponents.curation.workbench;
import java.util.HashMap;
import java.util.HashSet;
