Update COAL-SDS to OODT 1.2.5

capstone-coal · Sep 17, 2018 · 68bc2ae · 68bc2ae
1 parent be0d593
commit 68bc2ae
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 48 deletions.
diff --git a/crawler/src/main/resources/bin/crawlctl b/crawler/src/main/resources/bin/crawlctl
@@ -15,4 +15,4 @@
 # under the License.    
 ##########################################################################
 
-java -Djava.util.logging.config.file=../etc/logging.properties -Djava.ext.dirs=../lib org.apache.oodt.cas.crawl.daemon.CrawlDaemonController $@
+java -Djava.util.logging.config.file=../etc/logging.properties -classpath "../lib/*" org.apache.oodt.cas.crawl.daemon.CrawlDaemonController $@
diff --git a/crawler/src/main/resources/bin/crawler_launcher b/crawler/src/main/resources/bin/crawler_launcher
@@ -68,7 +68,7 @@ fi
 cd "$CRAWLER_HOME"/bin
 
 "$_RUNJAVA" $JAVA_OPTS $OODT_OPTS \
-   -Djava.ext.dirs="$CRAWLER_HOME"/lib \
+   -classpath "$CRAWLER_HOME/lib/*" \
    -Djava.util.logging.config.file="$CRAWLER_HOME"/etc/logging.properties \
    -Dorg.apache.oodt.cas.crawl.bean.repo=file:"$CRAWLER_HOME"/policy/crawler-config.xml \
    -Dorg.apache.oodt.cas.cli.action.spring.config=file:"$CRAWLER_HOME"/policy/cmd-line-actions.xml \

diff --git a/crawler/src/main/resources/etc/logging.properties b/crawler/src/main/resources/etc/logging.properties
@@ -20,11 +20,11 @@
 handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
 
 # Set the default logging level for the root logger
-.level = ALL
+.level = DEBUG
 
 # Set the default logging level for new ConsoleHandler instances
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.FileHandler.level = ALL
+java.util.logging.ConsoleHandler.level = DEBUG
+java.util.logging.FileHandler.level = DEBUG
 
 # Set the default formatter for new ConsoleHandler instances
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
@@ -38,15 +38,15 @@ java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
 
 # Set the default logging level for the subsystems
 
-org.apache.oodt.cas.crawl.level = ALL
+org.apache.oodt.cas.crawl.level = DEBUG
 
-org.apache.oodt.cas.crawl.action.level = ALL
+org.apache.oodt.cas.crawl.action.level = DEBUG
 
-org.apache.oodt.cas.crawl.typedetection.level = ALL
+org.apache.oodt.cas.crawl.typedetection.level = DEBUG
 
-org.apache.oodt.cas.crawl.util.level = ALL
+org.apache.oodt.cas.crawl.util.level = DEBUG
 
-org.apache.oodt.cas.crawl.config.level = ALL
+org.apache.oodt.cas.crawl.config.level = DEBUG
 
 # control the underlying commons-httpclient transport layer for xmlrpc 
 org.apache.commons.httpclient.level = INFO

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -30,7 +30,7 @@
    <name>Distribution (RADiX Distro of OODT)</name>
    <packaging>pom</packaging>
    <properties>
-      <tomcat.version>5.5.23</tomcat.version>
+      <tomcat.version>9.0.7</tomcat.version>
    </properties>
    <profiles>
       <profile>
@@ -123,8 +123,8 @@
                         <configuration>
                            <artifactItems>
                               <artifactItem>
-                                 <groupId>tomcat</groupId>
-                                 <artifactId>apache-tomcat</artifactId>
+                                 <groupId>org.apache.tomcat</groupId>
+                                 <artifactId>tomcat</artifactId>
                                  <version>${tomcat.version}</version>
                                  <type>zip</type>
                                  <overWrite>false</overWrite>
@@ -278,8 +278,8 @@
                         <configuration>
                            <artifactItems>
                               <artifactItem>
-                                 <groupId>tomcat</groupId>
-                                 <artifactId>apache-tomcat</artifactId>
+                                 <groupId>org.apache.tomcat</groupId>
+                                 <artifactId>tomcat</artifactId>
                                  <version>${tomcat.version}</version>
                                  <type>zip</type>
                                  <overWrite>false</overWrite>

diff --git a/distribution/src/main/resources/bin/ingest b/distribution/src/main/resources/bin/ingest
@@ -19,7 +19,7 @@ cd $DIR
 export DIR_PATH=`pwd`
 
 export FILEMGR_URL="http://localhost:9000"
-export OODT_HOME="/usr/local/coal-sds-deploy" 
+export OODT_HOME="/usr/local/coal-sds-deploy"
 
 if [ "$#" -ne 1 ]; then
    echo "Usage: $0 <dir>"
@@ -33,4 +33,4 @@ else
     --productPath $1 \
     --metExtractor org.apache.oodt.cas.metadata.extractors.TikaCmdLineMetExtractor \
     --metExtractorConfig $OODT_HOME/data/met/tika.conf
-fi
+fi
diff --git a/filemgr/src/main/resources/bin/filemgr b/filemgr/src/main/resources/bin/filemgr
@@ -81,7 +81,7 @@ if [ "$1" = "start" ]; then
   cd "$FILEMGR_HOME"/bin
 
   "$_RUNJAVA" $JAVA_OPTS $OODT_OPTS \
-    -Djava.ext.dirs="$FILEMGR_HOME"/lib \
+    -classpath "$FILEMGR_HOME/lib/*" \
     -Djava.util.logging.config.file="$FILEMGR_HOME"/etc/logging.properties \
     -Dorg.apache.oodt.cas.filemgr.properties="$FILEMGR_HOME"/etc/filemgr.properties \
     -Djava.io.tmpdir="$OODT_TMPDIR" \

diff --git a/filemgr/src/main/resources/bin/filemgr-client b/filemgr/src/main/resources/bin/filemgr-client
@@ -69,7 +69,7 @@ fi
 cd "$FILEMGR_HOME"/bin
 
 "$_RUNJAVA" $JAVA_OPTS $OODT_OPTS \
-  -Djava.ext.dirs="$FILEMGR_HOME"/lib \
+  -classpath "$FILEMGR_HOME/lib/*" \
   -Dorg.apache.oodt.cas.filemgr.properties="$FILEMGR_HOME"/etc/filemgr.properties \
   -Djava.util.logging.config.file="$FILEMGR_HOME"/etc/logging.properties \
   -Dorg.apache.oodt.cas.cli.action.spring.config=file:"$FILEMGR_HOME"/policy/cmd-line-actions.xml \

diff --git a/filemgr/src/main/resources/bin/query-tool b/filemgr/src/main/resources/bin/query-tool
@@ -73,5 +73,5 @@ fi
 cd "$FILEMGR_HOME"/bin
 
 "$_RUNJAVA" $JAVA_OPTS $OODT_OPTS \
-  -Djava.endorsed.dirs=../lib \
+  -classpath "../lib/*" \
   org.apache.oodt.cas.filemgr.tools.QueryTool "$@"
diff --git a/filemgr/src/main/resources/etc/filemgr.fm-solr-catalog.properties b/filemgr/src/main/resources/etc/filemgr.fm-solr-catalog.properties
@@ -20,7 +20,7 @@ filemgr.repository.factory=org.apache.oodt.cas.filemgr.repository.XMLRepositoryM
 
 # Solr catalog factory
 filemgr.catalog.factory=org.apache.oodt.cas.filemgr.catalog.solr.SolrCatalogFactory
-org.apache.oodt.cas.filemgr.catalog.solr.url=http://localhost:8080/solr/oodt-fm
+org.apache.oodt.cas.filemgr.catalog.solr.url=http://localhost:8080/solr/#/oodt-fm
 
 # data transfer factory
 filemgr.datatransfer.factory=org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory
@@ -45,16 +45,16 @@ org.apache.oodt.cas.filemgr.catalog.lucene.writeLockTimeout.seconds=60
 org.apache.oodt.cas.filemgr.catalog.lucene.mergeFactor=20
 
 # XML repository manager configuration
-org.apache.oodt.cas.filemgr.repositorymgr.dirs=file:///usr/local/coal-sds-deploy/policy/oodt
+org.apache.oodt.cas.filemgr.repositorymgr.dirs=file:///usr/local/coal-sds-deploy/filemgr/policy/oodt
 
 # XML validation layer configuration
-org.apache.oodt.cas.filemgr.validation.dirs=file:///usr/local/coal-sds-deploy/policy/oodt
+org.apache.oodt.cas.filemgr.validation.dirs=file:///usr/local/coal-sds-deploy/filemgr/policy/oodt
 
 # remote data transfer configuration
 org.apache.oodt.cas.filemgr.datatransfer.remote.chunkSize=1024
 
 # location of Mime-Type repository
-org.apache.oodt.cas.filemgr.mime.type.repository=/usr/local/coal-sds-deploy/etc/mime-types.xml
+org.apache.oodt.cas.filemgr.mime.type.repository=/usr/local/coal-sds-deploy/filemgr/etc/mime-types.xml
 
 
 ############ data source configuration ##################################

diff --git a/filemgr/src/main/resources/etc/filemgr.properties b/filemgr/src/main/resources/etc/filemgr.properties
@@ -29,6 +29,9 @@ filemgr.client=org.apache.oodt.cas.filemgr.system.rpc.AvroFileManagerClientFacto
 filemgr.catalog.factory=org.apache.oodt.cas.filemgr.catalog.solr.SolrCatalogFactory
 org.apache.oodt.cas.filemgr.catalog.solr.url=http://localhost:8080/solr/oodt-fm
 
+# Lucene catalog factory
+#filemgr.catalog.factory=org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory
+
 # data transfer factory
 filemgr.datatransfer.factory=org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory
 

diff --git a/filemgr/src/main/resources/etc/logging.properties b/filemgr/src/main/resources/etc/logging.properties
@@ -19,11 +19,11 @@
 handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
 
 # Set the default logging level for the root logger
-.level = ALL
+.level = DEBUG
 
 # Set the default logging level for new ConsoleHandler instances
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.FileHandler.level = ALL
+java.util.logging.ConsoleHandler.level = DEBUG
+java.util.logging.FileHandler.level = DEBUG
 
 # Set the default formatter for new ConsoleHandler instances
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter

diff --git a/pcs/src/main/resources/bin/pcs_ll b/pcs/src/main/resources/bin/pcs_ll
@@ -42,6 +42,6 @@ set DIR_PATH = `pwd`
 cd $ORIG_DIR
 
 java -Djava.util.logging.config.file=$DIR_PATH/../etc/logging.properties \
-    -Djava.ext.dirs=$DIR_PATH/../lib:$DIR_PATH/../../filemgr/lib:$DIR_PATH/../../workflow/lib \
+    -classpath "$DIR_PATH/../lib/*:$DIR_PATH/../../filemgr/lib/*:$DIR_PATH/../../workflow/lib/*" \
 	org.apache.oodt.pcs.tools.PCSLongLister \
 	$FILEMGR_URL $DIR_PATH/../policy/pcs-ll-conf.xml $argv[2-$#argv]
diff --git a/pcs/src/main/resources/bin/pcs_stat b/pcs/src/main/resources/bin/pcs_stat
@@ -68,7 +68,7 @@ set DIR_PATH = `pwd`
 cd $ORIG_DIR
 
 java -Djava.util.logging.config.file=$DIR_PATH/../etc/logging.properties \
-    -Djava.ext.dirs=$DIR_PATH/../lib:$DIR_PATH/../../filemgr/lib:$DIR_PATH/../workflow/lib:$DIR_PATH/../../resmgr/lib \
+    -classpath "$DIR_PATH/../lib/*:$DIR_PATH/../../filemgr/lib/*:$DIR_PATH/../workflow/lib/*:$DIR_PATH/../../resmgr/lib/*" \
     -Dorg.apache.oodt.cas.filemgr.properties=$DIR_PATH/../../filemgr/etc/filemgr.properties \
 	org.apache.oodt.pcs.tools.PCSHealthMonitor \
 	$FILEMGR_URL \

diff --git a/pcs/src/main/resources/bin/pcs_trace b/pcs/src/main/resources/bin/pcs_trace
@@ -29,7 +29,7 @@ if ( $#argv != 1 ) then
 	echo "Usage: $0 <product>"
 	exit 1
 else
-	java -Djava.ext.dirs=$DIR_PATH/../lib:$DIR_PATH/../../filemgr/lib:$DIR_PATH/../../workflow/lib \
+	java -classpath "$DIR_PATH/../lib/*:$DIR_PATH/../../filemgr/lib/*:$DIR_PATH/../../workflow/lib/*" \
     -Djava.util.logging.config.file=$DIR_PATH/../etc/logging.properties \
     -Dorg.apache.oodt.cas.filemgr.properties=$DIR_PATH/../../filemgr/etc/filemgr.properties \
 	org.apache.oodt.pcs.tools.PCSTrace \

diff --git a/pcs/src/main/resources/etc/logging.properties b/pcs/src/main/resources/etc/logging.properties
@@ -19,10 +19,10 @@
 handlers = java.util.logging.ConsoleHandler
 
 # Set the default logging level for the root logger
-.level = ALL
+.level = DEBUG
 
 # Set the default logging level for new ConsoleHandler instances
-java.util.logging.ConsoleHandler.level = ALL
+java.util.logging.ConsoleHandler.level = DEBUG
 
 # Set the default formatter for new ConsoleHandler instances
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter

diff --git a/pom.xml b/pom.xml
@@ -19,16 +19,16 @@
 
   <groupId>com.github.capstone-coal</groupId>
   <artifactId>coal-sds</artifactId>
-  <name>Data Management System</name>
+  <name>coal-sds Data Management System</name>
   <packaging>pom</packaging>
-  <description>Data Management System Powered by Apache OODT delivered via RADiX</description>
+  <description>coal-sds Data Management System Powered by Apache OODT delivered via RADiX</description>
   <version>0.1</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <oodt.version>1.2.2</oodt.version>
-    <oodt.pge.version>1.2.2</oodt.pge.version>
+    <oodt.version>1.2.5</oodt.version>
+    <oodt.pge.version>1.2.5</oodt.pge.version>
    <!-- Maven plugin dependencies -->
     <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
     <maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
@@ -137,4 +137,4 @@
     <module>distribution</module>
     <module>webapps</module>
   </modules>
-</project>
+</project>
diff --git a/resmgr/src/main/resources/bin/batch_stub b/resmgr/src/main/resources/bin/batch_stub
@@ -25,7 +25,7 @@ if ( $#argv != 1 ) then
         echo "Usage: $0 <port>"
         exit 1
 else
-        java -Djava.ext.dirs=../lib \
+        java -classpath "../lib/*" \
         org.apache.oodt.cas.resource.system.extern.XmlRpcBatchStub \
         -Dorg.apache.oodt.cas.pge.task.metkeys.legacyMode="true" \
         -Dorg.apache.oodt.cas.pge.task.status.legacyMode="true" \

diff --git a/resmgr/src/main/resources/bin/resmgr b/resmgr/src/main/resources/bin/resmgr
@@ -87,7 +87,7 @@ if [ "$1" = "start" ]; then
   cd "$RESMGR_HOME"/bin
 
   "$_RUNJAVA" $JAVA_OPTS $OODT_OPTS \
-    -Djava.ext.dirs="$RESMGR_HOME"/lib \
+    -classpath "$RESMGR_HOME/lib/*" \
     -Djava.util.logging.config.file="$RESMGR_HOME"/etc/logging.properties \
     -Dorg.apache.oodt.cas.resource.properties="$RESMGR_HOME"/etc/resource.properties \
     -Djava.io.tmpdir="$OODT_TMPDIR" \

diff --git a/resmgr/src/main/resources/bin/resmgr-client b/resmgr/src/main/resources/bin/resmgr-client
@@ -26,7 +26,7 @@ fi
 export JAVA_HOME
 
 $JAVA_HOME/bin/java \
-        -Djava.ext.dirs=../lib \
+        -classpath "../lib/*" \
         -Dorg.apache.oodt.cas.resource.properties=../etc/resource.properties \
         -Djava.util.logging.config.file=../etc/logging.properties \
         -Dorg.apache.oodt.cas.cli.action.spring.config=../policy/cmd-line-actions.xml \

diff --git a/resmgr/src/main/resources/etc/logging.properties b/resmgr/src/main/resources/etc/logging.properties
@@ -20,11 +20,11 @@
 handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
 
 # Set the default logging level for the root logger
-.level = ALL
+.level = DEBUG
 
 # Set the default logging level for new ConsoleHandler instances
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.FileHandler.level = ALL
+java.util.logging.ConsoleHandler.level = DEBUG
+java.util.logging.FileHandler.level = DEBUG
 
 # Set the default formatter for new ConsoleHandler instances
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter

diff --git a/workflow/src/main/resources/bin/wmgr b/workflow/src/main/resources/bin/wmgr
@@ -80,7 +80,7 @@ if [ "$1" = "start" ]; then
   cd "$WORKFLOW_HOME"/bin
 
   "$_RUNJAVA" $JAVA_OPTS $OODT_OPTS \
-    -Djava.ext.dirs="$WORKFLOW_HOME"/lib \
+    -classpath "$WORKFLOW_HOME/lib/*" \
     -Djava.util.logging.config.file="$WORKFLOW_HOME"/etc/logging.properties \
     -Dorg.apache.oodt.cas.workflow.properties="$WORKFLOW_HOME"/etc/workflow.properties \
     -Djava.io.tmpdir="$OODT_TMPDIR" \

diff --git a/workflow/src/main/resources/bin/wmgr-client b/workflow/src/main/resources/bin/wmgr-client
@@ -68,7 +68,7 @@ fi
 cd "$WORKFLOW_HOME"/bin
 
 "$_RUNJAVA" $JAVA_OPTS $OODT_OPTS \
-  -Djava.ext.dirs="$WORKFLOW_HOME"/lib \
+  -classpath "$WORKFLOW_HOME/lib/*" \
   -Djava.util.logging.config.file="$WORKFLOW_HOME"/etc/logging.properties \
   -Dorg.apache.oodt.cas.cli.action.spring.config=file:"$WORKFLOW_HOME"/policy/cmd-line-actions.xml \
   -Dorg.apache.oodt.cas.cli.option.spring.config=file:"$WORKFLOW_HOME"/policy/cmd-line-options.xml \

diff --git a/workflow/src/main/resources/etc/logging.properties b/workflow/src/main/resources/etc/logging.properties
@@ -19,11 +19,11 @@
 handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
 
 # Set the default logging level for the root logger
-.level = ALL
+.level = DEBUG
 
 # Set the default logging level for new ConsoleHandler instances
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.FileHandler.level = ALL
+java.util.logging.ConsoleHandler.level = DEBUG
+java.util.logging.FileHandler.level = DEBUG
 
 # Set the default formatter for new ConsoleHandler instances
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter