Author: kelly
Date: Sun Jul 18 21:10:41 2010
New Revision: 965292
URL: http://svn.apache.org/viewvc?rev=965292&view=rev
Log:
WIP OODT-15 OODT-16
"app/fmbrowser" is now functional; add std ignores for target dir; replace
Caltech copyright notice in "About..." info with ASF; add ASF notice to
filemgr-browser script and pom; fix relative path to oodt-core pom; use
org.apache.poi for POI groupId; add version numbers for POI and JUnit.
Modified:
incubator/oodt/trunk/app/fmbrowser/ (props changed)
incubator/oodt/trunk/app/fmbrowser/pom.xml
incubator/oodt/trunk/app/fmbrowser/src/main/bin/filemgr-browser
incubator/oodt/trunk/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/WindowListener.java
incubator/oodt/trunk/pom.xml
Propchange: incubator/oodt/trunk/app/fmbrowser/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jul 18 21:10:41 2010
@@ -0,0 +1,9 @@
+._*
+.DS_Store
+*.log
+*.pyc
+*.pyo
+*.egg-info
+dist
+build
+target
Modified: incubator/oodt/trunk/app/fmbrowser/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/app/fmbrowser/pom.xml?rev=965292&r1=965291&r2=965292&view=diff
==============================================================================
--- incubator/oodt/trunk/app/fmbrowser/pom.xml (original)
+++ incubator/oodt/trunk/app/fmbrowser/pom.xml Sun Jul 18 21:10:41 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>org.apache.oodt</groupId>
<artifactId>oodt-core</artifactId>
- <relativePath>../../pom.xml</relativePath>
+ <version>${oodt.version}</version>
+ <relativePath>../../core/pom.xml</relativePath>
</parent>
<artifactId>cas-fm-browser</artifactId>
<name>Catalog and Archive File Management Browser</name>
@@ -24,14 +42,14 @@
<version>${oodt.version}</version>
</dependency>
<dependency>
- <groupId>poi</groupId>
+ <groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>${poi.version}</version>
+ <version>3.2-FINAL</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/oodt/trunk/app/fmbrowser/src/main/bin/filemgr-browser
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/app/fmbrowser/src/main/bin/filemgr-browser?rev=965292&r1=965291&r2=965292&view=diff
==============================================================================
--- incubator/oodt/trunk/app/fmbrowser/src/main/bin/filemgr-browser (original)
+++ incubator/oodt/trunk/app/fmbrowser/src/main/bin/filemgr-browser Sun Jul 18
21:10:41 2010
@@ -5,8 +5,20 @@
# chkconfig: 345 88 22
# description: CAS File Manager Browser
#
-# Copyright (c) 2007 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
+#
+# 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.
#
# $Id$
Modified:
incubator/oodt/trunk/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/WindowListener.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/WindowListener.java?rev=965292&r1=965291&r2=965292&view=diff
==============================================================================
---
incubator/oodt/trunk/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/WindowListener.java
(original)
+++
incubator/oodt/trunk/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/controller/WindowListener.java
Sun Jul 18 21:10:41 2010
@@ -46,8 +46,7 @@ public class WindowListener implements A
public void actionPerformed(ActionEvent arg0) {
if (arg0.getActionCommand().equals("About")) {
String aboutInfo = "OODT Catalog and Archive Server File Manger
Browser.\n"
- + "Copyright (c) 2007, California Institute of Technology.\n"
- + "ALL RIGHTS RESERVED. U.S. Government sponsorship acknowledged.";
+ + "Copyright (c) 2010, Apache Software Foundation.";
JOptionPane.showMessageDialog(window, aboutInfo);
} else if (arg0.getActionCommand().equals("Query Language")) {
String aboutQueryLanguage = "The CAS File Manager Browser uses the
Lucene Query Language.\n"
Modified: incubator/oodt/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/pom.xml?rev=965292&r1=965291&r2=965292&view=diff
==============================================================================
--- incubator/oodt/trunk/pom.xml (original)
+++ incubator/oodt/trunk/pom.xml Sun Jul 18 21:10:41 2010
@@ -56,6 +56,6 @@ the License.
<module>webapp/filemgr</module>
<module>webapp/fmprod</module>
<module>webapp/workflow</module>
- <!-- broken: <module>app/fmbrowser</module> -->
+ <module>app/fmbrowser</module>
</modules>
</project>
