Author: challngr
Date: Wed Jul 15 19:02:33 2015
New Revision: 1691258
URL: http://svn.apache.org/r1691258
Log:
UIMA-4358 Remove derby and uima-ducc-db project from build.
Modified:
uima/sandbox/uima-ducc/trunk/pom.xml
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_props_manager
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties
uima/sandbox/uima-ducc/trunk/src/main/resources/log4j.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml
Modified: uima/sandbox/uima-ducc/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/pom.xml?rev=1691258&r1=1691257&r2=1691258&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/pom.xml Wed Jul 15 19:02:33 2015
@@ -121,11 +121,6 @@
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
- <artifactId>uima-ducc-db</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
<artifactId>uima-ducc-user</artifactId>
<version>${project.version}</version>
</dependency>
@@ -180,10 +175,6 @@
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
- <artifactId>uima-ducc-db</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
<artifactId>uima-ducc-user</artifactId>
</dependency>
<dependency>
@@ -494,7 +485,6 @@
<module>uima-ducc-duccdocs</module>
<module>uima-ducc-web</module>
<module>uima-ducc-examples</module>
- <module>uima-ducc-db</module>
<module>uima-ducc-spawn</module>
<module>uima-ducc-user</module>
<!-- Note: uima-ducc-container has a test dependency on
uima-ducc-user so must be built after it -->
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py?rev=1691258&r1=1691257&r2=1691258&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py Wed Jul 15 19:02:33 2015
@@ -161,13 +161,7 @@ class Ducc(DuccUtil):
if ( c == 'pm' ):
if ( self.pm_jvm_args != None ):
jvm_opts.append(self.pm_jvm_args)
-
- if ( c == 'db' ):
- if ( self.db_jvm_args != None ):
- jvm_opts.append(self.db_jvm_args)
- self.add_to_classpath(ducc_home + '/lib/derby/*')
-
-
+
if ( c == 'sm' ):
if ( self.sm_jvm_args != None ):
jvm_opts.append(self.sm_jvm_args)
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_props_manager
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_props_manager?rev=1691258&r1=1691257&r2=1691258&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_props_manager (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_props_manager Wed Jul 15
19:02:33 2015
@@ -28,7 +28,7 @@ from ducc_util import DuccUtil
from properties import Properties
from properties import Property
-class DuccPropManager():
+class DuccPropManager:
def __init__(self):
# simple bootstratp to establish DUCC_HOME and to set the python path
so it can
# find the common code in DUCC_HOME/admin
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1691258&r1=1691257&r2=1691258&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py Wed Jul 15
19:02:33 2015
@@ -262,7 +262,7 @@ class DuccUtil(DuccBase):
# CLASSPATH = CLASSPATH + ':' + DH + 'resources' UIMA-4168 Use API,
not classpath to configure log4j
# more are added to some components in ducc.py, e.g.
- # derby, apache-activemq/lib/optional, jetty from ws lib, jsp,
http- client
+ # apache-activemq/lib/optional, jetty from ws lib, jsp, http- client
#
os.environ['CLASSPATH'] = CLASSPATH
Modified: uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml?rev=1691258&r1=1691257&r2=1691258&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Wed Jul 15 19:02:33
2015
@@ -68,7 +68,6 @@ under the License.
<include>org.apache.uima:uima-ducc-sm</include>
<include>org.apache.uima:uima-ducc-orchestrator</include>
<include>org.apache.uima:uima-ducc-web</include>
- <include>org.apache.uima:uima-ducc-db</include>
<include>org.apache.uima:uima-ducc-container</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}-${project.version}.jar</outputFileNameMapping>
@@ -131,17 +130,6 @@ under the License.
</dependencySet>
<!-- xmlbeans is in UIMA-AS 2.6.0 package -->
-
- <dependencySet>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.apache.derby:derby</include>
- </includes>
- <outputDirectory>lib/derby</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <fileMode>644</fileMode>
- <directoryMode>755</directoryMode>
- </dependencySet>
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
Modified:
uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties?rev=1691258&r1=1691257&r2=1691258&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties
(original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties Wed
Jul 15 19:02:33 2015
@@ -151,7 +151,6 @@ ducc.orchestrator.jvm.args = -Xmx1G
ducc.rm.jvm.args = -Xmx1G
ducc.pm.jvm.args = -Xmx1G
ducc.sm.jvm.args = -Xmx1G
-ducc.db.jvm.args = -Xmx2G
ducc.ws.jvm.args = -Xmx2G -Djava.util.Arrays.useLegacyMergeSort=true
# ========== CLI Configuration block ==========
@@ -166,22 +165,6 @@ ducc.cli.httpclient.sotimeout=0
ducc.signature.required=on
#------------------------------------------------------------------------------
-# ========== DB Configuration block ==========
-ducc.db.configuration.class=org.apache.uima.ducc.db.config.DbComponentConfiguration
-ducc.db.state.update.endpoint=ducc.db.state
-# endpoint type choices[topic]
-ducc.db.state.update.endpoint.type=topic
-ducc.db.state.publish.rate=15000
-
-#ducc.db.home = ${DUCC_HOME}/db
-#ducc.db.name = duccDb
-#ducc.db.user = duccDucc
-#ducc.db.password = duccPw
-#ducc.db.driver = org.apache.derby.jdbc.EmbeddedDriver
-#ducc.db.protocol = jdbc:derby:
-
-# ========== DB Configuration block ==========
-
# ========== Web Server Configuration block ==========
ducc.ws.configuration.class=org.apache.uima.ducc.ws.config.WebServerConfiguration
# Optionally configure the webserver to run on a non-head node
Modified: uima/sandbox/uima-ducc/trunk/src/main/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/log4j.xml?rev=1691258&r1=1691257&r2=1691258&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/log4j.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/log4j.xml Wed Jul 15
19:02:33 2015
@@ -59,16 +59,6 @@
<param name="ConversionPattern" value="%d{DATE} %5p %X{COMPONENT}.%c{1}-
%X{JID} %X{METHOD} %m%n"/>
</layout>
</appender>
-
- <appender name="dblog"
class="org.apache.uima.ducc.common.utils.DeferredOpenRollingAppender">
- <param name="append" value="true"/>
- <param name="file" value="${DUCC_HOME}/logs/db.log"/>
- <param name="maxBackupIndex" value="5" />
- <param name="maxFileSize" value="10MB" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{DATE} %5p %X{COMPONENT}.%c{1}
- %m%n"/>
- </layout>
- </appender>
<appender name="orlog"
class="org.apache.uima.ducc.common.utils.DeferredOpenRollingAppender">
<param name="append" value="true"/>
@@ -160,11 +150,6 @@
<appender-ref ref="rmlog" />
</category>
- <category name="org.apache.uima.ducc.db" additivity="true">
- <priority value="info"/>
- <appender-ref ref="dblog" />
- </category>
-
<category name="org.apache.uima.ducc.orchestrator" additivity="true">
<priority value="info"/>
<appender-ref ref="orlog" />
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml?rev=1691258&r1=1691257&r2=1691258&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml Wed Jul 15 19:02:33
2015
@@ -165,7 +165,6 @@
<jetty.version>7.4.4.v20110707</jetty.version>
<orbit-org-apache-jasper.version>2.1.0.v201110031002</orbit-org-apache-jasper.version>
<servlet-api.version>2.5</servlet-api.version>
- <derby.version>10.10.1.1</derby.version>
<http.commons.client.version>4.3.5</http.commons.client.version>
<http.commons.client-cache.version>4.3.5</http.commons.client-cache.version>
