update for EOFM-17

?? ?

2008-03-19 1318ecb38a3695dba4329b0106015178cc46fd84

update for EOFM-17

 ximple-spatialjob/pom.xml

@@ -569,8 +569,7 @@
            <exclude>${online.skip.pattern}</exclude>
            <exclude>${stress.skip.pattern}</exclude>
          </excludes>
          <argLine>-Xmx${test.maxHeapSize} -Dorg.geotools.test.extensive=${extensive.tests}
            -Dorg.geotools.test.interactive=${interactive.tests} -Djava.awt.headless=${java.awt.headless}
          <argLine>-Xmx${test.maxHeapSize} -Djava.awt.headless=${java.awt.headless}
          </argLine>
          <!-- Ignores test failure only if we are generating a       -->
          <!-- report for publication on the web site. See the        -->
@@ -578,10 +577,6 @@
          <testFailureIgnore>
            ${allow.test.failure.ignore}
          </testFailureIgnore>

          <!-- The two following options have the opposite value of what we would
               like. They are that way because they don't seem to work as expected
               with Surefire 2.3. TODO: Try again when Surefire 2.4 will be available. -->

          <!-- Option to print summary of test suites or just print the test cases that has errors. -->
          <printSummary>true</printSummary>

 ximple-spatialjob/src/main/java/com/ximple/eofms/filter/ElementDispatcher.java

@@ -15,6 +15,11 @@
        rules = new LinkedList<ElementDispatchableFilter>();
    }

    public LinkedList<ElementDispatchableFilter> getRules()
    {
        return rules;
    }

    public void addRule(ElementDispatchableFilter rule)
    {
        rules.add(rule);

 ximple-spatialjob/src/main/java/com/ximple/eofms/filter/TypeCompIdDispatchableFilter.java

@@ -28,6 +28,26 @@
        this.createStrategy = createStrategy;
    }

    public int getTid()
    {
        return tid;
    }

    public void setTid(int tid)
    {
        this.tid = tid;
    }

    public int getCid()
    {
        return cid;
    }

    public void setCid(int cid)
    {
        this.cid = cid;
    }

    public CreateFeatureTypeStrategy getCreateStrategy()
    {
        return createStrategy;

 ximple-spatialjob/src/main/java/com/ximple/eofms/filter/TypeCompLevelIdDispatchableFilter.java

@@ -30,6 +30,36 @@
        this.createStrategy = createStrategy;
    }

    public int getTid()
    {
        return tid;
    }

    public void setTid(int tid)
    {
        this.tid = tid;
    }

    public int getCid()
    {
        return cid;
    }

    public void setCid(int cid)
    {
        this.cid = cid;
    }

    public int getLid()
    {
        return lid;
    }

    public void setLid(int lid)
    {
        this.lid = lid;
    }

    public CreateFeatureTypeStrategy getCreateStrategy()
    {
        return createStrategy;

 ximple-spatialjob/src/test/java/com/ximple/eofms/filter/ElementDispatcherTest.java

@@ -16,12 +16,24 @@
    private static final String TestConfigName = "testElementFilter.xml";

    @Test
    public void testLoadRules() throws IOException, SAXException
    public void testLoadRules() throws IOException
    {
        File rules = TestData.file(this, TestRulesName);
        Digester digester = DigesterLoader.createDigester(rules.toURI().toURL());
        // File config = TestData.file(this, TestConfigName);
        // ElementDispatcher ed = (ElementDispatcher) digester.parse(config);
        Assert.assertNotNull(digester);
    }

    @Test
    public void testLoadConfig() throws IOException, SAXException
    {
        File rules = TestData.file(this, TestRulesName);
        Digester digester = DigesterLoader.createDigester(rules.toURI().toURL());
        File config = TestData.file(this, TestConfigName);
        ElementDispatcher ed = (ElementDispatcher) digester.parse(config);
        Assert.assertNotNull(ed);
        Assert.assertEquals(ed.getRules().size(), 3);
        // ed.getRules().get(0);
    }
}

 ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testElementFilter.xml

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="big5" ?>
<ElementDispatcherRules>
  <TypeFilter name="DemoFeature1">
    <tid>106</tid>
    <description>DemoFilter for DemoFeature</description>
  </TypeFilter>
  <TypeCompFilter name="DemoFeature2">
    <tid>107</tid>
    <cid>0</cid>
    <description>DemoFilter for DemoFeature</description>
  </TypeCompFilter>
  <TypeCompLevelFilter name="DemoFeature3">
    <tid>106</tid>
    <cid>1</cid>
    <lid>34</lid>
    <description>DemoFilter for DemoFeature</description>
  </TypeCompLevelFilter>
</ElementDispatcherRules>

 ximple-spatialjob/src/test/resources/com/ximple/eofms/filter/test-data/testRules.xml

@@ -8,8 +8,27 @@
      <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="id"/>
      <bean-property-setter-rule pattern="description"/>
      <bean-property-setter-rule pattern="tid"/>
    </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="tid"/>
      <bean-property-setter-rule pattern="cid"/>
    </pattern>
    <pattern value="TypeCompLevelFilter">
      <object-create-rule classname="com.ximple.eofms.filter.TypeCompLevelIdDispatchableFilter"/>
      <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="tid"/>
      <bean-property-setter-rule pattern="cid"/>
      <bean-property-setter-rule pattern="lid"/>
    </pattern>
  </pattern>
</digester-rules>