From 589570dd9aebeb79c3574a9fd44a2ef9735daf82 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Mon, 05 May 2008 12:50:19 +0800
Subject: [PATCH] update for EOFM-34
---
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml | 2
xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml | 2
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleUpgradeBlob2UDTJob.java | 6 ++-
xdgnjobs/ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java | 4 +-
xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testRules.xml | 65 +++++++++++++++++++++++---------
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/TypeCompIdDispatchableFilter.java | 3 +
xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/filter/ElementDispatcherRules.xml | 10 +++++
7 files changed, 67 insertions(+), 25 deletions(-)
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
index b0de3b8..bb6e9eb 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -64,7 +64,7 @@
<start-time>2008-03-01T18:10:00</start-time>
<!-- repeat indefinitely every 10 seconds -->
<repeat-count>0</repeat-count>
- <repeat-interval>1000</repeat-interval>
+ <repeat-interval>500</repeat-interval>
<!-- <repeat-interval>72000000</repeat-interval> -->
</simple>
</trigger>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/TypeCompIdDispatchableFilter.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/TypeCompIdDispatchableFilter.java
index a8fde34..7484323 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/TypeCompIdDispatchableFilter.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/TypeCompIdDispatchableFilter.java
@@ -81,6 +81,9 @@
} catch (IllegalAttributeException e)
{
logger.error(e.getMessage(), e);
+ } catch (NullPointerException e)
+ {
+ logger.error(e.getMessage(), e);
}
return null;
}
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleUpgradeBlob2UDTJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleUpgradeBlob2UDTJob.java
index f77744b..1ba97a3 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleUpgradeBlob2UDTJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleUpgradeBlob2UDTJob.java
@@ -35,8 +35,10 @@
try
{
- exetcuteConvert(jobContext, _orgSchema, _dataPath);
- exetcuteConvert(jobContext, "CMMS_SPATIALDB", _dataPath);
+ for (String orgSchema : _orgSchema)
+ {
+ exetcuteConvert(jobContext, orgSchema, _dataPath);
+ }
} catch (SQLException e)
{
throw new JobExecutionException("Database error.", e);
diff --git a/xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/filter/ElementDispatcherRules.xml b/xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/filter/ElementDispatcherRules.xml
index a9a6037..a16c6e0 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/filter/ElementDispatcherRules.xml
+++ b/xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/filter/ElementDispatcherRules.xml
@@ -22,6 +22,11 @@
<set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
<set-properties-rule/>
</pattern>
+ <pattern value="LineTextCreateStrategy">
+ <object-create-rule classname="com.ximple.eofms.filter.CreateLineTextStrategy"/>
+ <set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
+ <set-properties-rule/>
+ </pattern>
</pattern>
<pattern value="TypeCompFilter">
<object-create-rule classname="com.ximple.eofms.filter.TypeCompIdDispatchableFilter"/>
@@ -48,6 +53,11 @@
<set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
<set-properties-rule/>
</pattern>
+ <pattern value="LineTextCreateStrategy">
+ <object-create-rule classname="com.ximple.eofms.filter.CreateLineTextStrategy"/>
+ <set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
+ <set-properties-rule/>
+ </pattern>
</pattern>
<pattern value="TypeCompLevelFilter">
<object-create-rule classname="com.ximple.eofms.filter.TypeCompLevelIdDispatchableFilter"/>
diff --git a/xdgnjobs/ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java b/xdgnjobs/ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java
index a921169..7b21d8a 100644
--- a/xdgnjobs/ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java
+++ b/xdgnjobs/ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java
@@ -47,14 +47,14 @@
Assert.assertTrue(tFilter.getCreateStrategy() instanceof CreateLineStringStrategy);
*/
- filter = ed.getRules().get(0);
+ filter = ed.getRules().get(1);
Assert.assertTrue(filter instanceof TypeCompIdDispatchableFilter);
TypeCompIdDispatchableFilter tcFilter = (TypeCompIdDispatchableFilter) filter;
Assert.assertEquals(tcFilter.getName(), "DemoFeature2");
Assert.assertEquals(tcFilter.getTid(), 107);
Assert.assertEquals(tcFilter.getCid(), 11);
Assert.assertNotNull(tcFilter.getCreateStrategy());
- Assert.assertTrue(tcFilter.getCreateStrategy() instanceof CreateTextStrategy);
+ Assert.assertTrue(tcFilter.getCreateStrategy() instanceof CreateLineTextStrategy);
/*
filter = ed.getRules().get(2);
Assert.assertTrue(filter instanceof TypeCompLevelIdDispatchableFilter);
diff --git a/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml b/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml
index 2be77e2..8679532 100644
--- a/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml
+++ b/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml
@@ -16,7 +16,7 @@
<elementCriterion>
<elementtype>7</elementtype>
</elementCriterion>
- <TextCreateStrategy/>
+ <LineTextCreateStrategy/>
</TypeCompFilter>
<TypeCompLevelFilter name="DemoFeature3">
<tid>108</tid>
diff --git a/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testRules.xml b/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testRules.xml
index e9da319..a16c6e0 100644
--- a/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testRules.xml
+++ b/xdgnjobs/ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testRules.xml
@@ -10,8 +10,33 @@
<set-properties-rule/>
<bean-property-setter-rule pattern="name"/>
<bean-property-setter-rule pattern="description"/>
+ <bean-property-setter-rule pattern="elmtype"/>
+ <bean-property-setter-rule pattern="tid"/>
+ <pattern value="LineCreateStrategy">
+ <object-create-rule classname="com.ximple.eofms.filter.CreateLineStringStrategy"/>
+ <set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
+ <set-properties-rule/>
+ </pattern>
+ <pattern value="TextCreateStrategy">
+ <object-create-rule classname="com.ximple.eofms.filter.CreateTextStrategy"/>
+ <set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
+ <set-properties-rule/>
+ </pattern>
+ <pattern value="LineTextCreateStrategy">
+ <object-create-rule classname="com.ximple.eofms.filter.CreateLineTextStrategy"/>
+ <set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
+ <set-properties-rule/>
+ </pattern>
+ </pattern>
+ <pattern value="TypeCompFilter">
+ <object-create-rule classname="com.ximple.eofms.filter.TypeCompIdDispatchableFilter"/>
+ <set-next-rule methodname="addRule" paramtype="com.ximple.eofms.filter.ElementDispatchableFilter"/>
+ <set-properties-rule/>
+ <bean-property-setter-rule pattern="name"/>
+ <bean-property-setter-rule pattern="description"/>
<!-- <bean-property-setter-rule pattern="elmtype"/> -->
<bean-property-setter-rule pattern="tid"/>
+ <bean-property-setter-rule pattern="cid"/>
<pattern value="elementCriterion">
<object-create-rule classname="com.ximple.eofms.filter.ElementTypeCriterion"/>
<set-next-rule methodname="addCriterion" paramtype="com.ximple.eofms.filter.ElementTypeCriterion"/>
@@ -28,23 +53,8 @@
<set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
<set-properties-rule/>
</pattern>
- </pattern>
- <pattern value="TypeCompFilter">
- <object-create-rule classname="com.ximple.eofms.filter.TypeCompIdDispatchableFilter"/>
- <set-next-rule methodname="addRule" paramtype="com.ximple.eofms.filter.ElementDispatchableFilter"/>
- <set-properties-rule/>
- <bean-property-setter-rule pattern="name"/>
- <bean-property-setter-rule pattern="description"/>
- <bean-property-setter-rule pattern="elmtype"/>
- <bean-property-setter-rule pattern="tid"/>
- <bean-property-setter-rule pattern="cid"/>
- <pattern value="LineCreateStrategy">
- <object-create-rule classname="com.ximple.eofms.filter.CreateLineStringStrategy"/>
- <set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
- <set-properties-rule/>
- </pattern>
- <pattern value="TextCreateStrategy">
- <object-create-rule classname="com.ximple.eofms.filter.CreateTextStrategy"/>
+ <pattern value="LineTextCreateStrategy">
+ <object-create-rule classname="com.ximple.eofms.filter.CreateLineTextStrategy"/>
<set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
<set-properties-rule/>
</pattern>
@@ -55,10 +65,22 @@
<set-properties-rule/>
<bean-property-setter-rule pattern="name"/>
<bean-property-setter-rule pattern="description"/>
- <bean-property-setter-rule pattern="elmtype"/>
+ <!-- <bean-property-setter-rule pattern="elmtype"/> -->
<bean-property-setter-rule pattern="tid"/>
<bean-property-setter-rule pattern="cid"/>
- <bean-property-setter-rule pattern="lid"/>
+ <!-- <bean-property-setter-rule pattern="lid"/> -->
+ <pattern value="elementCriterion">
+ <object-create-rule classname="com.ximple.eofms.filter.ElementTypeCriterion"/>
+ <set-next-rule methodname="addCriterion" paramtype="com.ximple.eofms.filter.ElementTypeCriterion"/>
+ <set-properties-rule/>
+ <bean-property-setter-rule pattern="elementType"/>
+ </pattern>
+ <pattern value="elementLayerCriterion">
+ <object-create-rule classname="com.ximple.eofms.filter.ElementLevelCriterion"/>
+ <set-next-rule methodname="addLayerCriterion" paramtype="com.ximple.eofms.filter.ElementLevelCriterion"/>
+ <set-properties-rule/>
+ <bean-property-setter-rule pattern="elementLayer"/>
+ </pattern>
<pattern value="LineCreateStrategy">
<object-create-rule classname="com.ximple.eofms.filter.CreateLineStringStrategy"/>
<set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
@@ -69,6 +91,11 @@
<set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
<set-properties-rule/>
</pattern>
+ <pattern value="LineTextCreateStrategy">
+ <object-create-rule classname="com.ximple.eofms.filter.CreateLineTextStrategy"/>
+ <set-next-rule methodname="setCreateStrategy" paramtype="com.ximple.eofms.filter.CreateFeatureTypeStrategy"/>
+ <set-properties-rule/>
+ </pattern>
</pattern>
</pattern>
</digester-rules>
\ No newline at end of file
--
Gitblit v0.0.0-SNAPSHOT