Changeset 181

Show
Ignore:
Timestamp:
09/07/08 15:16:39 (2 years ago)
Author:
wallsc
Message:

Sync with MBP

Location:
trunk
Files:
34 modified
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/Chapter01/Hello/.classpath

    r93 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<classpath> 
    3         <classpathentry kind="src" path="src/main/java"/> 
    4         <classpathentry kind="src" path="src/main/resources"/> 
    5         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    6         <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> 
    7         <classpathentry kind="output" path="bin"/> 
     2  <classpathentry kind="src" path="src/main/java"/> 
     3  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> 
     4  <classpathentry kind="output" path="target/classes"/> 
     5  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     6  <classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/> 
     7  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.5.3/spring-2.5.3.jar"/> 
     8  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> 
     9  <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> 
     10  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/> 
     11  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> 
     12  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/> 
     13  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/> 
    814</classpath> 
  • trunk/Chapter01/Hello/.project

    r15 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<projectDescription> 
    3         <name>Hello (SiA2 chapter 1)</name> 
    4         <comment></comment> 
    5         <projects> 
    6         </projects> 
    7         <buildSpec> 
    8                 <buildCommand> 
    9                         <name>org.eclipse.jdt.core.javabuilder</name> 
    10                         <arguments> 
    11                         </arguments> 
    12                 </buildCommand> 
    13                 <buildCommand> 
    14                         <name>org.maven.ide.eclipse.maven2Builder</name> 
    15                         <arguments> 
    16                         </arguments> 
    17                 </buildCommand> 
    18         </buildSpec> 
    19         <natures> 
    20                 <nature>org.eclipse.jdt.core.javanature</nature> 
    21                 <nature>org.maven.ide.eclipse.maven2Nature</nature> 
    22         </natures> 
     2  <name>Hello</name> 
     3  <comment/> 
     4  <projects/> 
     5  <buildSpec> 
     6    <buildCommand> 
     7      <name>org.eclipse.jdt.core.javabuilder</name> 
     8    </buildCommand> 
     9    <buildCommand> 
     10      <name>org.maven.ide.eclipse.maven2Builder</name> 
     11    </buildCommand> 
     12  </buildSpec> 
     13  <natures> 
     14    <nature>org.eclipse.jdt.core.javanature</nature> 
     15    <nature>org.maven.ide.eclipse.maven2Nature</nature> 
     16  </natures> 
    2317</projectDescription> 
  • trunk/Chapter01/Knight/.classpath

    r8 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<classpath> 
    3         <classpathentry kind="src" path="src/main/java"/> 
    4         <classpathentry kind="src" path="src/main/resources"/> 
    5         <classpathentry kind="src" path="src/test/java"/> 
    6         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    7         <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> 
    8         <classpathentry kind="output" path="bin"/> 
     2  <classpathentry kind="src" path="src/main/java"/> 
     3  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> 
     4  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> 
     5  <classpathentry kind="output" path="target/classes"/> 
     6  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     7  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/> 
     8  <classpathentry kind="var" path="M2_REPO/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"/> 
     9  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/> 
     10  <classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/> 
     11  <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> 
     12  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.5.3/spring-2.5.3.jar"/> 
     13  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/> 
     14  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> 
     15  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> 
    916</classpath> 
  • trunk/Chapter01/Knight/.project

    r8 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<projectDescription> 
    3         <name>Knight (SiA2 chapter1)</name> 
    4         <comment></comment> 
    5         <projects> 
    6         </projects> 
    7         <buildSpec> 
    8                 <buildCommand> 
    9                         <name>org.eclipse.jdt.core.javabuilder</name> 
    10                         <arguments> 
    11                         </arguments> 
    12                 </buildCommand> 
    13                 <buildCommand> 
    14                         <name>org.maven.ide.eclipse.maven2Builder</name> 
    15                         <arguments> 
    16                         </arguments> 
    17                 </buildCommand> 
    18         </buildSpec> 
    19         <natures> 
    20                 <nature>org.eclipse.jdt.core.javanature</nature> 
    21                 <nature>org.maven.ide.eclipse.maven2Nature</nature> 
    22         </natures> 
     2  <name>Knight</name> 
     3  <comment/> 
     4  <projects/> 
     5  <buildSpec> 
     6    <buildCommand> 
     7      <name>org.eclipse.jdt.core.javabuilder</name> 
     8    </buildCommand> 
     9    <buildCommand> 
     10      <name>org.maven.ide.eclipse.maven2Builder</name> 
     11    </buildCommand> 
     12  </buildSpec> 
     13  <natures> 
     14    <nature>org.eclipse.jdt.core.javanature</nature> 
     15    <nature>org.maven.ide.eclipse.maven2Nature</nature> 
     16  </natures> 
    2317</projectDescription> 
  • trunk/Chapter02/SpringIdol/.classpath

    r18 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<classpath> 
    3         <classpathentry kind="src" path="src/main/java"/> 
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    5         <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> 
    6         <classpathentry kind="output" path="bin"/> 
     2  <classpathentry kind="src" path="src/main/java"/> 
     3  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> 
     4  <classpathentry kind="output" path="target/classes"/> 
     5  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     6  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/> 
     7  <classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/> 
     8  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/> 
     9  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.5.3/spring-2.5.3.jar"/> 
     10  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/> 
     11  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> 
     12  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> 
     13  <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> 
    714</classpath> 
  • trunk/Chapter02/SpringIdol/.project

    r18 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<projectDescription> 
    3         <name>Spring Idol (SiA2 chapter 2)</name> 
    4         <comment></comment> 
    5         <projects> 
    6         </projects> 
    7         <buildSpec> 
    8                 <buildCommand> 
    9                         <name>org.eclipse.jdt.core.javabuilder</name> 
    10                         <arguments> 
    11                         </arguments> 
    12                 </buildCommand> 
    13                 <buildCommand> 
    14                         <name>org.maven.ide.eclipse.maven2Builder</name> 
    15                         <arguments> 
    16                         </arguments> 
    17                 </buildCommand> 
    18         </buildSpec> 
    19         <natures> 
    20                 <nature>org.eclipse.jdt.core.javanature</nature> 
    21                 <nature>org.maven.ide.eclipse.maven2Nature</nature> 
    22         </natures> 
     2  <name>springidol-ch2</name> 
     3  <comment/> 
     4  <projects/> 
     5  <buildSpec> 
     6    <buildCommand> 
     7      <name>org.eclipse.jdt.core.javabuilder</name> 
     8    </buildCommand> 
     9    <buildCommand> 
     10      <name>org.maven.ide.eclipse.maven2Builder</name> 
     11    </buildCommand> 
     12  </buildSpec> 
     13  <natures> 
     14    <nature>org.eclipse.jdt.core.javanature</nature> 
     15    <nature>org.maven.ide.eclipse.maven2Nature</nature> 
     16  </natures> 
    2317</projectDescription> 
  • trunk/Chapter03/LimeAndCoconut/.classpath

    r26 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<classpath> 
    3         <classpathentry kind="src" path="src/main/java"/> 
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    5         <classpathentry exported="true" kind="lib" path="/Users/wallsc/Applications/java/eclipse/eclipse-callisto/plugins/org.codehaus.groovy.eclipse_1.0.0.20070118/lib/commons-io-1.2.jar"/> 
    6         <classpathentry exported="true" kind="lib" path="/Users/wallsc/Applications/java/eclipse/eclipse-callisto/plugins/org.codehaus.groovy.eclipse_1.0.0.20070118/lib/commons-lang-2.1.jar"/> 
    7         <classpathentry exported="true" kind="lib" path="/Users/wallsc/Applications/java/eclipse/eclipse-callisto/plugins/org.codehaus.groovy.eclipse_1.0.0.20070118/lib/groovy-all-1.0.jar"/> 
    8         <classpathentry exported="true" kind="lib" path="bin-groovy"/> 
    9         <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> 
    10         <classpathentry kind="output" path="bin"/> 
     2  <classpathentry kind="src" path="src/main/java"/> 
     3  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> 
     4  <classpathentry kind="output" path="target/classes"/> 
     5  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     6  <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/0.9.5/nekohtml-0.9.5.jar"/> 
     7  <classpathentry kind="var" path="M2_REPO/antlr/antlrall/2.7.4/antlrall-2.7.4.jar"/> 
     8  <classpathentry kind="var" path="M2_REPO/groovy/groovy-all/1.0/groovy-all-1.0.jar"/> 
     9  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0/geronimo-jta_1.0.1B_spec-1.0.jar"/> 
     10  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> 
     11  <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.0/commons-cli-1.0.jar"/> 
     12  <classpathentry kind="var" path="M2_REPO/org/jruby/jruby/1.0/jruby-1.0.jar"/> 
     13  <classpathentry kind="var" path="M2_REPO/axion/axion/1.0-M3-dev/axion-1.0-M3-dev.jar"/> 
     14  <classpathentry kind="var" path="M2_REPO/radeox/radeox-oro/0.9/radeox-oro-0.9.jar"/> 
     15  <classpathentry kind="var" path="M2_REPO/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.jar"/> 
     16  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/> 
     17  <classpathentry kind="var" path="M2_REPO/radeox/radeox/0.9/radeox-0.9.jar"/> 
     18  <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> 
     19  <classpathentry kind="var" path="M2_REPO/openejb/openejb-core/1.0/openejb-core-1.0.jar"/> 
     20  <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar" sourcepath="M2_REPO/oro/oro/2.0.8/oro-2.0.8-sources.jar"/> 
     21  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> 
     22  <classpathentry kind="var" path="M2_REPO/bsf/bsf/2.4.0/bsf-2.4.0.jar"/> 
     23  <classpathentry kind="var" path="M2_REPO/asm/asm/2.2.3/asm-2.2.3.jar"/> 
     24  <classpathentry kind="var" path="M2_REPO/commons-primitives/commons-primitives/1.0/commons-primitives-1.0.jar"/> 
     25  <classpathentry kind="var" path="M2_REPO/idb/idb/3.26/idb-3.26.jar"/> 
     26  <classpathentry kind="var" path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/> 
     27  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.jar"/> 
     28  <classpathentry kind="var" path="M2_REPO/jmock/jmock/1.1.0/jmock-1.1.0.jar"/> 
     29  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/> 
     30  <classpathentry kind="var" path="M2_REPO/asm/asm-commons/2.2.3/asm-commons-2.2.3.jar"/> 
     31  <classpathentry kind="var" path="M2_REPO/cglib/cglib-full/2.0.2/cglib-full-2.0.2.jar"/> 
     32  <classpathentry kind="var" path="M2_REPO/openejb/openejb-loader/1.0/openejb-loader-1.0.jar"/> 
     33  <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/> 
     34  <classpathentry kind="var" path="M2_REPO/com/tonicsystems/jarjar/0.6/jarjar-0.6.jar"/> 
     35  <classpathentry kind="var" path="M2_REPO/net/java/dev/javacc/javacc/3.2/javacc-3.2.jar"/> 
     36  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.0/geronimo-servlet_2.4_spec-1.0.jar"/> 
     37  <classpathentry kind="var" path="M2_REPO/jmock/jmock-cglib/1.1.0/jmock-cglib-1.1.0.jar"/> 
     38  <classpathentry kind="var" path="M2_REPO/mx4j/mx4j/3.0.1/mx4j-3.0.1.jar"/> 
     39  <classpathentry kind="var" path="M2_REPO/asm/asm-tree/2.2.3/asm-tree-2.2.3.jar"/> 
     40  <classpathentry kind="var" path="M2_REPO/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar"/> 
     41  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar"/> 
     42  <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> 
     43  <classpathentry kind="var" path="M2_REPO/mockobjects/mockobjects-core/0.09/mockobjects-core-0.09.jar"/> 
     44  <classpathentry kind="var" path="M2_REPO/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.jar"/> 
     45  <classpathentry kind="var" path="M2_REPO/jline/jline/0.9.91/jline-0.9.91.jar"/> 
     46  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.jar"/> 
     47  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> 
     48  <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.0/backport-util-concurrent-3.0.jar" sourcepath="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.0/backport-util-concurrent-3.0-sources.jar"/> 
     49  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/> 
     50  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/1.0/commons-lang-1.0.jar"/> 
     51  <classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/> 
     52  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> 
     53  <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> 
     54  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/> 
     55  <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/> 
     56  <classpathentry kind="var" path="M2_REPO/regexp/regexp/1.3/regexp-1.3.jar"/> 
     57  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/> 
     58  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.3/spring-core-2.5.3.jar"/> 
     59  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.0/geronimo-ejb_2.1_spec-1.0.jar"/> 
     60  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.5.3/spring-2.5.3.jar"/> 
     61  <classpathentry kind="var" path="M2_REPO/castor/castor/0.9.9.0-pre/castor-0.9.9.0-pre.jar"/> 
     62  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> 
     63  <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.5/qdox-1.5.jar"/> 
     64  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/> 
     65  <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2/xstream-1.2.jar"/> 
    1166</classpath> 
  • trunk/Chapter03/LimeAndCoconut/.project

    r53 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<projectDescription> 
    3         <name>Chapter 3 - Lime and Coconut</name> 
    4         <comment></comment> 
    5         <projects> 
    6         </projects> 
    7         <buildSpec> 
    8                 <buildCommand> 
    9                         <name>org.eclipse.jdt.core.javabuilder</name> 
    10                         <arguments> 
    11                         </arguments> 
    12                 </buildCommand> 
    13                 <buildCommand> 
    14                         <name>org.codehaus.groovy.eclipse.groovyBuilder</name> 
    15                         <arguments> 
    16                         </arguments> 
    17                 </buildCommand> 
    18                 <buildCommand> 
    19                         <name>org.maven.ide.eclipse.maven2Builder</name> 
    20                         <arguments> 
    21                         </arguments> 
    22                 </buildCommand> 
    23         </buildSpec> 
    24         <natures> 
    25                 <nature>org.eclipse.jdt.core.javanature</nature> 
    26                 <nature>org.maven.ide.eclipse.maven2Nature</nature> 
    27                 <nature>org.codehaus.groovy.eclipse.groovyNature</nature> 
    28         </natures> 
     2  <name>LimeAndCoconut</name> 
     3  <comment/> 
     4  <projects/> 
     5  <buildSpec> 
     6    <buildCommand> 
     7      <name>org.eclipse.jdt.core.javabuilder</name> 
     8    </buildCommand> 
     9    <buildCommand> 
     10      <name>org.codehaus.groovy.eclipse.groovyBuilder</name> 
     11    </buildCommand> 
     12    <buildCommand> 
     13      <name>org.maven.ide.eclipse.maven2Builder</name> 
     14    </buildCommand> 
     15  </buildSpec> 
     16  <natures> 
     17    <nature>org.eclipse.jdt.core.javanature</nature> 
     18    <nature>org.maven.ide.eclipse.maven2Nature</nature> 
     19    <nature>org.codehaus.groovy.eclipse.groovyNature</nature> 
     20  </natures> 
    2921</projectDescription> 
  • trunk/Chapter03/LimeAndCoconut/.settings/org.eclipse.jdt.core.prefs

    r26 r181  
    1 #Thu Apr 19 23:27:42 CDT 2007 
     1#Wed Apr 09 22:17:17 CDT 2008 
     2org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 
    23eclipse.preferences.version=1 
    34org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.testsuite,*.deploy,*.location,*.execution,*.datapool,*.artifact,*.html,*.svg,*.groovy 
     5org.eclipse.jdt.core.compiler.source=1.5 
     6org.eclipse.jdt.core.compiler.compliance=1.5 
  • trunk/Chapter03/Misc/.classpath

    r47 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<classpath> 
    3         <classpathentry kind="src" path="src/main/java"/> 
    4         <classpathentry kind="src" path="src/test/java"/> 
    5         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    6         <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> 
    7         <classpathentry kind="output" path="bin"/> 
     2  <classpathentry kind="src" path="src/main/java"/> 
     3  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> 
     4  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> 
     5  <classpathentry kind="output" path="target/classes"/> 
     6  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     7  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/> 
     8  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/> 
     9  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> 
     10  <classpathentry kind="var" path="M2_REPO/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"/> 
     11  <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> 
     12  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> 
     13  <classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/> 
     14  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/> 
     15  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.5.3/spring-2.5.3.jar"/> 
    816</classpath> 
  • trunk/Chapter03/Misc/.project

    r28 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<projectDescription> 
    3         <name>Misc (SiA2 chapter 3)</name> 
    4         <comment></comment> 
    5         <projects> 
    6         </projects> 
    7         <buildSpec> 
    8                 <buildCommand> 
    9                         <name>org.eclipse.jdt.core.javabuilder</name> 
    10                         <arguments> 
    11                         </arguments> 
    12                 </buildCommand> 
    13                 <buildCommand> 
    14                         <name>org.maven.ide.eclipse.maven2Builder</name> 
    15                         <arguments> 
    16                         </arguments> 
    17                 </buildCommand> 
    18         </buildSpec> 
    19         <natures> 
    20                 <nature>org.eclipse.jdt.core.javanature</nature> 
    21                 <nature>org.maven.ide.eclipse.maven2Nature</nature> 
    22         </natures> 
     2  <name>misc</name> 
     3  <comment/> 
     4  <projects/> 
     5  <buildSpec> 
     6    <buildCommand> 
     7      <name>org.eclipse.jdt.core.javabuilder</name> 
     8    </buildCommand> 
     9    <buildCommand> 
     10      <name>org.maven.ide.eclipse.maven2Builder</name> 
     11    </buildCommand> 
     12  </buildSpec> 
     13  <natures> 
     14    <nature>org.eclipse.jdt.core.javanature</nature> 
     15    <nature>org.maven.ide.eclipse.maven2Nature</nature> 
     16  </natures> 
    2317</projectDescription> 
  • trunk/Chapter03/SpringIdol/.classpath

    r23 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<classpath> 
    3         <classpathentry kind="src" path="src/main/java"/> 
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    5         <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> 
    6         <classpathentry kind="output" path="bin"/> 
     2  <classpathentry kind="src" path="src/main/java"/> 
     3  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> 
     4  <classpathentry kind="output" path="target/classes"/> 
     5  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     6  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.jar"/> 
     7  <classpathentry kind="var" path="M2_REPO/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"/> 
     8  <classpathentry kind="var" path="M2_REPO/cglib/cglib-full/2.0.2/cglib-full-2.0.2.jar"/> 
     9  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.5.3/spring-2.5.3.jar"/> 
     10  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> 
     11  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> 
     12  <classpathentry kind="var" path="M2_REPO/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.jar"/> 
     13  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.3/spring-core-2.5.3.jar"/> 
     14  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.jar"/> 
     15  <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> 
     16  <classpathentry kind="var" path="M2_REPO/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.jar"/> 
     17  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/> 
     18  <classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/> 
     19  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/> 
     20  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/> 
    721</classpath> 
  • trunk/Chapter03/SpringIdol/.project

    r23 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<projectDescription> 
    3         <name>Spring Idol (SiA2 chapter 3)</name> 
    4         <comment></comment> 
    5         <projects> 
    6         </projects> 
    7         <buildSpec> 
    8                 <buildCommand> 
    9                         <name>org.eclipse.jdt.core.javabuilder</name> 
    10                         <arguments> 
    11                         </arguments> 
    12                 </buildCommand> 
    13                 <buildCommand> 
    14                         <name>org.maven.ide.eclipse.maven2Builder</name> 
    15                         <arguments> 
    16                         </arguments> 
    17                 </buildCommand> 
    18         </buildSpec> 
    19         <natures> 
    20                 <nature>org.eclipse.jdt.core.javanature</nature> 
    21                 <nature>org.maven.ide.eclipse.maven2Nature</nature> 
    22         </natures> 
     2  <name>springidol-ch3</name> 
     3  <comment/> 
     4  <projects/> 
     5  <buildSpec> 
     6    <buildCommand> 
     7      <name>org.eclipse.jdt.core.javabuilder</name> 
     8    </buildCommand> 
     9    <buildCommand> 
     10      <name>org.maven.ide.eclipse.maven2Builder</name> 
     11    </buildCommand> 
     12  </buildSpec> 
     13  <natures> 
     14    <nature>org.eclipse.jdt.core.javanature</nature> 
     15    <nature>org.maven.ide.eclipse.maven2Nature</nature> 
     16  </natures> 
    2317</projectDescription> 
  • trunk/Chapter04/SpringIdol/.classpath

    r48 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<classpath> 
    3         <classpathentry kind="src" path="src/main/java"/> 
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    5         <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> 
    6         <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/> 
    7         <classpathentry kind="output" path="bin"/> 
     2  <classpathentry kind="src" path="src/main/java"/> 
     3  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> 
     4  <classpathentry kind="output" path="target/classes"/> 
     5  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     6  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.5.3/spring-2.5.3.jar"/> 
     7  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/> 
     8  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/> 
     9  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> 
     10  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/> 
     11  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> 
     12  <classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/> 
     13  <classpathentry kind="var" path="M2_REPO/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"/> 
     14  <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> 
    815</classpath> 
  • trunk/Chapter04/SpringIdol/.project

    r48 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<projectDescription> 
    3         <name>Chapter 4 - Spring Idol</name> 
    4         <comment></comment> 
    5         <projects> 
    6         </projects> 
    7         <buildSpec> 
    8                 <buildCommand> 
    9                         <name>org.eclipse.ajdt.core.ajbuilder</name> 
    10                         <arguments> 
    11                         </arguments> 
    12                 </buildCommand> 
    13                 <buildCommand> 
    14                         <name>org.maven.ide.eclipse.maven2Builder</name> 
    15                         <arguments> 
    16                         </arguments> 
    17                 </buildCommand> 
    18         </buildSpec> 
    19         <natures> 
    20                 <nature>org.eclipse.ajdt.ui.ajnature</nature> 
    21                 <nature>org.eclipse.jdt.core.javanature</nature> 
    22                 <nature>org.maven.ide.eclipse.maven2Nature</nature> 
    23         </natures> 
     2  <name>springidol-ch4</name> 
     3  <comment/> 
     4  <projects/> 
     5  <buildSpec> 
     6    <buildCommand> 
     7      <name>org.eclipse.ajdt.core.ajbuilder</name> 
     8    </buildCommand> 
     9    <buildCommand> 
     10      <name>org.maven.ide.eclipse.maven2Builder</name> 
     11    </buildCommand> 
     12    <buildCommand> 
     13      <name>org.eclipse.jdt.core.javabuilder</name> 
     14    </buildCommand> 
     15  </buildSpec> 
     16  <natures> 
     17    <nature>org.eclipse.ajdt.ui.ajnature</nature> 
     18    <nature>org.eclipse.jdt.core.javanature</nature> 
     19    <nature>org.maven.ide.eclipse.maven2Nature</nature> 
     20  </natures> 
    2421</projectDescription> 
  • trunk/Chapter09/Poker-WS/.classpath

    r6 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<classpath> 
    3         <classpathentry kind="src" path="src/main/resources"/> 
    4         <classpathentry kind="src" path="src/test/resources"/> 
    5         <classpathentry kind="src" path="src/test/java"/> 
    6         <classpathentry kind="src" path="src/main/java"/> 
    7         <classpathentry kind="src" path="client"/> 
    8         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    9         <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> 
    10         <classpathentry kind="output" path="bin"/> 
     2  <classpathentry kind="src" path="src/main/java"/> 
     3  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> 
     4  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> 
     5  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> 
     6  <classpathentry kind="output" path="target/classes"/> 
     7  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     8  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/2.5.2/spring-webmvc-2.5.2.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc/2.5.2/spring-webmvc-2.5.2-sources.jar"/> 
     9  <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-impl/1.2.2/axiom-impl-1.2.2.jar"/> 
     10  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5.2/spring-beans-2.5.2.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5.2/spring-beans-2.5.2-sources.jar"/> 
     11  <classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/> 
     12  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/> 
     13  <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar" sourcepath="M2_REPO/jdom/jdom/1.0/jdom-1.0-sources.jar"/> 
     14  <classpathentry kind="var" path="M2_REPO/org/springframework/ws/spring-oxm-tiger/1.5.0/spring-oxm-tiger-1.5.0.jar"/> 
     15  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/> 
     16  <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> 
     17  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"/> 
     18  <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/schema/XmlSchema/1.3.2/XmlSchema-1.3.2.jar"/> 
     19  <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar"/> 
     20  <classpathentry kind="var" path="M2_REPO/org/springframework/ws/spring-ws-core/1.5.0/spring-ws-core-1.5.0.jar"/> 
     21  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/2.5.2/spring-web-2.5.2.jar" sourcepath="M2_REPO/org/springframework/spring-web/2.5.2/spring-web-2.5.2-sources.jar"/> 
     22  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> 
     23  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.5.2/spring-context-2.5.2.jar" sourcepath="M2_REPO/org/springframework/spring-context/2.5.2/spring-context-2.5.2-sources.jar"/> 
     24  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/> 
     25  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/2.5.3/spring-test-2.5.3.jar"/> 
     26  <classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/> 
     27  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/2.5.2/spring-context-support-2.5.2.jar" sourcepath="M2_REPO/org/springframework/spring-context-support/2.5.2/spring-context-support-2.5.2-sources.jar"/> 
     28  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> 
     29  <classpathentry kind="var" path="M2_REPO/org/springframework/ws/spring-ws-core-tiger/1.5.0/spring-ws-core-tiger-1.5.0.jar"/> 
     30  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/> 
     31  <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/> 
     32  <classpathentry kind="var" path="M2_REPO/cglib/cglib-full/2.0.2/cglib-full-2.0.2.jar"/> 
     33  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/> 
     34  <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> 
     35  <classpathentry kind="var" path="M2_REPO/com/sun/xml/messaging/saaj/saaj-impl/1.3/saaj-impl-1.3.jar"/> 
     36  <classpathentry kind="var" path="M2_REPO/stax/stax/1.2.0/stax-1.2.0.jar"/> 
     37  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/2.5.2/spring-aop-2.5.2.jar" sourcepath="M2_REPO/org/springframework/spring-aop/2.5.2/spring-aop-2.5.2-sources.jar"/> 
     38  <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> 
     39  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.5.3/spring-2.5.3.jar"/> 
     40  <classpathentry kind="var" path="M2_REPO/org/codehaus/castor/castor/1.1/castor-1.1.jar"/> 
     41  <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> 
     42  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.3/spring-core-2.5.3.jar"/> 
     43  <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-api/1.2.2/axiom-api-1.2.2.jar"/> 
     44  <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar" sourcepath="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1-sources.jar"/> 
     45  <classpathentry kind="var" path="M2_REPO/org/springframework/ws/spring-xml/1.5.0/spring-xml-1.5.0.jar"/> 
     46  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> 
     47  <classpathentry kind="var" path="M2_REPO/org/springframework/ws/spring-oxm/1.5.0/spring-oxm-1.5.0.jar"/> 
    1148</classpath> 
  • trunk/Chapter09/Poker-WS/.project

    r58 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<projectDescription> 
    3         <name>Chapter 9 - Poker-WS</name> 
    4         <comment></comment> 
    5         <projects> 
    6         </projects> 
    7         <buildSpec> 
    8                 <buildCommand> 
    9                         <name>org.eclipse.jdt.core.javabuilder</name> 
    10                         <arguments> 
    11                         </arguments> 
    12                 </buildCommand> 
    13                 <buildCommand> 
    14                         <name>org.springframework.ide.eclipse.core.springbuilder</name> 
    15                         <arguments> 
    16                         </arguments> 
    17                 </buildCommand> 
    18                 <buildCommand> 
    19                         <name>org.maven.ide.eclipse.maven2Builder</name> 
    20                         <arguments> 
    21                         </arguments> 
    22                 </buildCommand> 
    23         </buildSpec> 
    24         <natures> 
    25                 <nature>org.eclipse.jdt.core.javanature</nature> 
    26                 <nature>org.maven.ide.eclipse.maven2Nature</nature> 
    27                 <nature>org.springframework.ide.eclipse.core.springnature</nature> 
    28         </natures> 
     2  <name>Poker-WS</name> 
     3  <comment/> 
     4  <projects/> 
     5  <buildSpec> 
     6    <buildCommand> 
     7      <name>org.eclipse.jdt.core.javabuilder</name> 
     8    </buildCommand> 
     9    <buildCommand> 
     10      <name>org.springframework.ide.eclipse.core.springbuilder</name> 
     11    </buildCommand> 
     12    <buildCommand> 
     13      <name>org.maven.ide.eclipse.maven2Builder</name> 
     14    </buildCommand> 
     15  </buildSpec> 
     16  <natures> 
     17    <nature>org.eclipse.jdt.core.javanature</nature> 
     18    <nature>org.maven.ide.eclipse.maven2Nature</nature> 
     19    <nature>org.springframework.ide.eclipse.core.springnature</nature> 
     20  </natures> 
    2921</projectDescription> 
  • trunk/Chapter09/Poker-WS/.springBeans

    r6 r181  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<beansProjectDescription> 
    3         <configExtensions> 
    4                 <configExtension>xml</configExtension> 
    5         </configExtensions> 
     3        <version>1</version> 
     4        <pluginVersion><![CDATA[2.0.3.v200802061800]]></pluginVersion> 
     5        <configSuffixes> 
     6                <configSuffix><![CDATA[xml]]></configSuffix> 
     7        </configSuffixes> 
     8        <enableImports><![CDATA[false]]></enableImports> 
    69        <configs> 
    7                 <config>src/main/webapp/WEB-INF/poker-servlet.xml</config> 
    810                <config>src/main/resources/poker-ws.xml</config> 
    911        </configs> 
    1012        <configSets> 
    1113                <configSet> 
    12                         <name>All</name> 
     14                        <name><![CDATA[All]]></name> 
    1315                        <allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding> 
    1416                        <incomplete>true</incomplete> 
    1517                        <configs> 
    1618                                <config>src/main/resources/poker-ws.xml</config> 
    17                                 <config>src/main/webapp/WEB-INF/poker-servlet.xml</config> 
    1819                        </configs> 
    1920                </configSet> 
  • trunk/Chapter09/Poker-WS/pom.xml

    r107 r181  
    1 <?xml version="1.0" encoding="UTF-8"?><project> 
    2   <parent> 
    3     <groupId>com.springinaction</groupId> 
    4     <artifactId>Chapter09</artifactId> 
    5     <version>2.0</version> 
    6   </parent> 
    7   <modelVersion>4.0.0</modelVersion> 
    8   <groupId>com.springinaction</groupId> 
    9   <artifactId>Poker-WS</artifactId> 
    10   <packaging>war</packaging> 
    11   <name>Spring in Action 2E, Spring-WS Example</name> 
    12    
    13   <repositories> 
    14     <repository> 
    15       <id>springframework.org</id> 
    16       <name>Springframework Maven SNAPSHOT Repository</name> 
    17       <url>http://static.springframework.org/maven2-snapshots/</url> 
    18     </repository> 
    19   </repositories> 
    20  
    21   <properties> 
    22     <spring.ws.version>1.0.1</spring.ws.version> 
    23   </properties> 
    24    
    25   <build> 
    26     <finalName>Poker-WS</finalName> 
    27     <plugins> 
    28           <!-- Jetty plugin to run app from Maven --> 
    29       <plugin>  
    30         <groupId>org.mortbay.jetty</groupId> 
    31         <artifactId>maven-jetty-plugin</artifactId> 
    32       </plugin>  
    33  
    34       <!-- Set source/target Java version --> 
    35       <plugin> 
    36         <artifactId>maven-compiler-plugin</artifactId> 
    37         <configuration> 
    38           <source>1.5</source> 
    39           <target>1.5</target> 
    40         </configuration> 
    41       </plugin> 
    42  
    43       <!-- Configure surefire to ignore integration tests on "test" and 
    44            to ignore plain unit-tests on "integration-test" --> 
    45       <plugin> 
    46         <groupId>org.apache.maven.plugins</groupId> 
    47         <artifactId>maven-surefire-plugin</artifactId> 
    48         <configuration> 
    49           <excludes> 
    50             <exclude>**/*ITest.java</exclude> 
    51           </excludes> 
    52         </configuration> 
    53         <executions> 
    54           <execution> 
    55           <id>integration tests</id> 
    56           <phase>integration-test</phase> 
    57           <goals><goal>test</goal></goals> 
    58         <configuration> 
    59           <includes> 
    60             <include>**/itest/*ITest.java</include> 
    61           </includes> 
    62           <excludes> 
    63             <exclude>none</exclude> 
    64           </excludes> 
    65         </configuration> 
    66           </execution> 
    67         </executions> 
    68       </plugin> 
    69  
    70       <!-- Start Jetty on pre-integration-test and shut it down on post-integration-test --> 
    71       <plugin> 
    72         <groupId>org.codehaus.cargo</groupId> 
    73         <artifactId>cargo-maven2-plugin</artifactId> 
    74         <executions> 
    75           <execution> 
    76             <id>start-container</id> 
    77             <phase>pre-integration-test</phase> 
    78             <goals> 
    79               <goal>start</goal> 
    80             </goals> 
     1<?xml version="1.0" encoding="UTF-8"?> 
     2<project> 
     3   <parent> 
     4      <groupId>com.springinaction</groupId> 
     5      <artifactId>Chapter09</artifactId> 
     6      <version>2.0</version> 
     7   </parent> 
     8   <modelVersion>4.0.0</modelVersion> 
     9   <groupId>com.springinaction</groupId> 
     10   <artifactId>Poker-WS</artifactId> 
     11   <packaging>war</packaging> 
     12   <name>Spring in Action 2E, Spring-WS Example</name> 
     13 
     14   <repositories> 
     15      <repository> 
     16         <id>springframework.org</id> 
     17         <name>Springframework Maven SNAPSHOT Repository</name> 
     18         <url>http://static.springframework.org/maven2-snapshots/</url> 
     19      </repository> 
     20   </repositories> 
     21 
     22   <properties> 
     23      <spring.ws.version>1.5.0</spring.ws.version> 
     24   </properties> 
     25 
     26   <build> 
     27      <finalName>Poker-WS</finalName> 
     28      <plugins> 
     29         <!-- Jetty plugin to run app from Maven --> 
     30         <plugin> 
     31            <groupId>org.mortbay.jetty</groupId> 
     32            <artifactId>maven-jetty-plugin</artifactId> 
     33         </plugin> 
     34 
     35         <!-- Set source/target Java version --> 
     36         <plugin> 
     37            <artifactId>maven-compiler-plugin</artifactId> 
    8138            <configuration> 
    82               <wait>false</wait> 
     39               <source>1.5</source> 
     40               <target>1.5</target> 
    8341            </configuration> 
    84           </execution> 
    85           <execution> 
    86             <id>stop-container</id> 
    87             <phase>post-integration-test</phase> 
    88             <goals> 
    89               <goal>stop</goal> 
    90             </goals> 
    91           </execution> 
    92         </executions> 
    93         <configuration> 
    94           <container> 
    95             <systemProperties> 
    96               <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log> 
    97             </systemProperties>  
    98           </container> 
    99         </configuration> 
    100       </plugin> 
    101     </plugins> 
    102   </build> 
    103    
    104   <dependencies> 
    105     <dependency> 
    106       <groupId>commons-logging</groupId> 
    107       <artifactId>commons-logging</artifactId> 
    108       <version>1.1</version> 
    109       <scope>compile</scope> 
    110     </dependency> 
    111     <dependency> 
    112       <groupId>javax.servlet</groupId> 
    113       <artifactId>servlet-api</artifactId> 
    114       <version>2.4</version> 
    115       <scope>provided</scope> 
    116     </dependency>     
    117     <dependency> 
    118       <groupId>org.springframework.ws</groupId> 
    119       <artifactId>spring-oxm</artifactId> 
    120       <version>${spring.ws.version}</version> 
    121       <scope>compile</scope> 
    122     </dependency> 
    123     <dependency> 
    124       <groupId>org.springframework.ws</groupId> 
    125       <artifactId>spring-xml</artifactId> 
    126       <version>${spring.ws.version}</version> 
    127       <scope>compile</scope> 
    128     </dependency> 
    129     <dependency> 
    130       <groupId>org.springframework.ws</groupId> 
    131       <artifactId>spring-ws-core-tiger</artifactId> 
    132       <version>${spring.ws.version}</version> 
    133     </dependency> 
    134     <dependency> 
    135       <groupId>org.springframework.ws</groupId> 
    136       <artifactId>spring-ws-core</artifactId> 
    137       <version>${spring.ws.version}</version> 
    138       <scope>compile</scope> 
    139  
    140       <exclusions> 
    141         <exclusion> 
    142           <groupId>org.springframework</groupId> 
    143           <artifactId>spring-aop</artifactId> 
    144         </exclusion> 
    145         <exclusion> 
    146           <groupId>org.springframework</groupId> 
    147           <artifactId>spring-beans</artifactId> 
    148         </exclusion> 
    149         <exclusion> 
    150           <groupId>org.springframework</groupId> 
    151           <artifactId>spring-context</artifactId> 
    152         </exclusion> 
    153         <exclusion> 
    154           <groupId>org.springframework</groupId> 
    155           <artifactId>spring-core</artifactId> 
    156         </exclusion> 
    157         <exclusion> 
    158           <groupId>org.springframework</groupId> 
    159           <artifactId>spring-dao</artifactId> 
    160         </exclusion> 
    161         <exclusion> 
    162           <groupId>org.springframework</groupId> 
    163           <artifactId>spring-jdbc</artifactId> 
    164         </exclusion> 
    165         <exclusion> 
    166           <groupId>org.springframework</groupId> 
    167           <artifactId>spring-remoting</artifactId> 
    168         </exclusion> 
    169         <exclusion> 
    170           <groupId>org.springframework</groupId> 
    171           <artifactId>spring-support</artifactId> 
    172         </exclusion> 
    173         <exclusion> 
    174           <groupId>org.springframework</groupId> 
    175           <artifactId>spring-web</artifactId> 
    176         </exclusion>  
    177         <exclusion> 
    178           <groupId>org.springframework</groupId> 
    179           <artifactId>spring-webmvc</artifactId> 
    180         </exclusion> 
    181       </exclusions>       
    182     </dependency> 
    183     <dependency> 
    184       <groupId>org.springframework</groupId> 
    185       <artifactId>spring-mock</artifactId> 
    186       <version>${spring.version}</version> 
    187       <scope>compile</scope> 
    188     </dependency> 
    189     <dependency> 
    190       <groupId>org.codehaus.castor</groupId> 
    191       <artifactId>castor</artifactId> 
    192       <version>1.1</version> 
    193       <scope>compile</scope> 
    194       <exclusions> 
    195         <exclusion> 
    196           <groupId>xerces</groupId> 
    197           <artifactId>xerces</artifactId> 
    198         </exclusion> 
    199       </exclusions> 
    200     </dependency>          
    201  
    202     <dependency> 
    203       <groupId>org.apache.ws.commons.axiom</groupId> 
    204       <artifactId>axiom-impl</artifactId> 
    205       <version>1.2.2</version> 
    206       <exclusions> 
    207         <exclusion> 
    208           <groupId>commons-logging</groupId> 
    209           <artifactId>commons-logging</artifactId> 
    210         </exclusion> 
    211       </exclusions> 
    212     </dependency> 
    213  
    214     <dependency> 
    215       <groupId>org.apache.ws.commons.axiom</groupId> 
    216       <artifactId>axiom-api</artifactId> 
    217       <version>1.2.2</version> 
    218     </dependency> 
    219  
    220  
    221     <dependency> 
    222       <groupId>stax</groupId> 
    223       <artifactId>stax</artifactId> 
    224       <version>1.2.0</version> 
    225     </dependency> 
    226  
    227     <dependency> 
    228       <groupId>javax.activation</groupId> 
    229       <artifactId>activation</artifactId> 
    230       <version>1.1</version> 
    231     </dependency>      
    232      
    233     <dependency> 
    234       <groupId>xerces</groupId> 
    235       <artifactId>xercesImpl</artifactId> 
    236       <version>2.8.0</version> 
    237       <scope>compile</scope> 
    238     </dependency> 
    239  
    240     <dependency> 
    241       <groupId>jdom</groupId> 
    242       <artifactId>jdom</artifactId> 
    243       <version>1.0</version> 
    244     </dependency> 
    245  
    246     <dependency> 
    247       <groupId>javax.xml.soap</groupId> 
    248       <artifactId>saaj-api</artifactId> 
    249       <version>1.3</version> 
    250     </dependency> 
    251  
    252     <dependency> 
    253       <groupId>com.sun.xml</groupId> 
    254       <artifactId>saaj-impl</artifactId> 
    255       <version>1.3</version> 
    256     </dependency> 
    257      
    258     <dependency> 
    259       <groupId>junit-addons</groupId> 
    260       <artifactId>junit-addons</artifactId> 
    261       <version>1.4</version> 
    262       <scope>test</scope> 
    263     </dependency> 
    264   </dependencies> 
     42         </plugin> 
     43 
     44         <!-- Configure surefire to ignore integration tests on "test" and 
     45            to ignore plain unit-tests on "integration-test" --> 
     46         <plugin> 
     47            <groupId>org.apache.maven.plugins</groupId> 
     48            <artifactId>maven-surefire-plugin</artifactId> 
     49            <configuration> 
     50               <excludes> 
     51                  <exclude>**/*ITest.java</exclude> 
     52               </excludes> 
     53            </configuration> 
     54            <executions> 
     55               <execution> 
     56                  <id>integration tests</id> 
     57                  <phase>integration-test</phase> 
     58                  <goals> 
     59                     <goal>test</goal> 
     60                  </goals> 
     61                  <configuration> 
     62                     <includes> 
     63                        <include>**/itest/*ITest.java</include> 
     64                     </includes> 
     65                     <excludes> 
     66                        <exclude>none</exclude> 
     67                     </excludes> 
     68                  </configuration> 
     69               </execution> 
     70            </executions> 
     71         </plugin> 
     72 
     73         <!-- Start Jetty on pre-integration-test and shut it down on post-integration-test --> 
     74         <plugin> 
     75            <groupId>org.codehaus.cargo</groupId> 
     76            <artifactId>cargo-maven2-plugin</artifactId> 
     77            <executions> 
     78               <execution> 
     79                  <id>start-container</id> 
     80                  <phase>pre-integration-test</phase> 
     81                  <goals> 
     82                     <goal>start</goal> 
     83                  </goals> 
     84                  <configuration> 
     85                     <wait>false</wait> 
     86                  </configuration> 
     87               </execution> 
     88               <execution> 
     89                  <id>stop-container</id> 
     90                  <phase>post-integration-test</phase> 
     91                  <goals> 
     92                     <goal>stop</goal> 
     93                  </goals> 
     94               </execution> 
     95            </executions> 
     96            <configuration> 
     97               <container> 
     98                  <systemProperties> 
     99                     <org.apache.commons.logging.Log> 
     100                        org.apache.commons.logging.impl.SimpleLog 
     101                     </org.apache.commons.logging.Log> 
     102                  </systemProperties> 
     103               </container> 
     104            </configuration> 
     105         </plugin> 
     106      </plugins> 
     107   </build> 
     108 
     109   <dependencies> 
     110      <dependency> 
     111         <groupId>commons-logging</groupId> 
     112         <artifactId>commons-logging</artifactId> 
     113         <version>1.1</version> 
     114         <scope>compile</scope> 
     115      </dependency> 
     116      <dependency> 
     117         <groupId>javax.servlet</groupId> 
     118         <artifactId>servlet-api</artifactId> 
     119         <version>2.4</version> 
     120         <scope>provided</scope> 
     121      </dependency> 
     122      <dependency> 
     123         <groupId>org.springframework.ws</groupId> 
     124         <artifactId>spring-oxm</artifactId> 
     125         <version>${spring.ws.version}</version> 
     126         <scope>compile</scope> 
     127      </dependency> 
     128      <dependency> 
     129         <groupId>org.springframework.ws</groupId> 
     130         <artifactId>spring-xml</artifactId> 
     131         <version>${spring.ws.version}</version> 
     132         <scope>compile</scope> 
     133      </dependency> 
     134      <dependency> 
     135         <groupId>org.springframework.ws</groupId> 
     136         <artifactId>spring-ws-core-tiger</artifactId> 
     137         <version>${spring.ws.version}</version> 
     138      </dependency> 
     139      <dependency> 
     140         <groupId>org.springframework.ws</groupId> 
     141         <artifactId>spring-ws-core</artifactId> 
     142         <version>${spring.ws.version}</version> 
     143         <scope>compile</scope> 
     144      </dependency> 
     145      <dependency> 
     146         <groupId>org.springframework</groupId> 
     147         <artifactId>spring-test</artifactId> 
     148         <version>${spring.version}</version> 
     149         <scope>compile</scope> 
     150      </dependency> 
     151      <dependency> 
     152         <groupId>org.codehaus.castor</groupId> 
     153         <artifactId>castor</artifactId> 
     154         <version>1.1</version> 
     155         <scope>compile</scope> 
     156         <exclusions> 
     157            <exclusion> 
     158               <groupId>xerces</groupId> 
     159               <artifactId>xerces</artifactId> 
     160            </exclusion> 
     161         </exclusions> 
     162      </dependency> 
     163 
     164      <dependency> 
     165         <groupId>org.apache.ws.commons.axiom</groupId> 
     166         <artifactId>axiom-impl</artifactId> 
     167         <version>1.2.2</version> 
     168         <exclusions> 
     169            <exclusion> 
     170               <groupId>commons-logging</groupId> 
     171               <artifactId>commons-logging</artifactId> 
     172            </exclusion> 
     173         </exclusions> 
     174      </dependency> 
     175 
     176      <dependency> 
     177         <groupId>org.apache.ws.commons.axiom</groupId> 
     178         <artifactId>axiom-api</artifactId> 
     179         <version>1.2.2</version> 
     180      </dependency> 
     181 
     182 
     183      <dependency> 
     184         <groupId>stax</groupId> 
     185         <artifactId>stax</artifactId> 
     186         <version>1.2.0</version> 
     187      </dependency> 
     188 
     189      <dependency> 
     190         <groupId>javax.activation</groupId> 
     191         <artifactId>activation</artifactId> 
     192         <version>1.1</version> 
     193      </dependency> 
     194 
     195      <dependency> 
     196         <groupId>xerces</groupId> 
     197         <artifactId>xercesImpl</artifactId> 
     198         <version>2.8.0</version> 
     199         <scope>compile</scope> 
     200      </dependency> 
     201 
     202      <dependency> 
     203         <groupId>jdom</groupId> 
     204         <artifactId>jdom</artifactId> 
     205         <version>1.0</version> 
     206      </dependency> 
     207 
     208      <dependency> 
     209         <groupId>javax.xml.soap</groupId> 
     210         <artifactId>saaj-api</artifactId> 
     211         <version>1.3</version> 
     212      </dependency> 
     213 
     214      <dependency> 
     215         <groupId>com.sun.xml</groupId> 
     216         <artifactId>saaj-impl</artifactId> 
     217         <version>1.3</version> 
     218      </dependency> 
     219 
     220      <dependency> 
     221         <groupId>junit-addons</groupId> 
     222         <artifactId>junit-addons</artifactId> 
     223         <version>1.4</version> 
     224         <scope>test</scope> 
     225      </dependency> 
     226   </dependencies> 
    265227</project> 
  • trunk/Chapter09/Poker-WS/src/main/java/com/springinaction/poker/webservice/EvaluateHandAnnotatedEndpoint.java

    r106 r181  
    1010@Endpoint 
    1111public class EvaluateHandAnnotatedEndpoint { 
    12    @PayloadRoot(namespace = "http://www.springinaction.com/poker/schemas", localPart = "EvaluateHandRequest") 
     12   @PayloadRoot(namespace = "http://www.springinaction.com/poker/schemas/1.1", localPart = "EvaluateHandRequest") 
    1313   public EvaluateHandResponse evaluateHand(EvaluateHandRequest request) { 
    1414      PokerHandType handType = pokerHandEvaluator.evaluateHand(new PokerHand( 
  • trunk/Chapter09/Poker-WS/src/main/webapp/WEB-INF/web.xml

    r98 r181  
    2727      <param-value>true</param-value> 
    2828    </init-param> 
     29    <init-param> 
     30      <param-name>contextConfigLocation</param-name> 
     31      <param-value>classpath:poker-servlet.xml</param-value> 
     32    </init-param> 
    2933  </servlet> 
    3034   
  • trunk/Chapter09/Poker-WS/src/test/java/com/springinaction/poker/PokerHandEvaluatorTest.java

    r40 r181  
    11package com.springinaction.poker; 
    22 
     3import static junitx.framework.Assert.*; 
    34import junit.framework.TestCase; 
    4 import junitx.framework.Assert; 
    55 
     6import org.junit.Before; 
     7import org.junit.Test; 
    68 
    79public class PokerHandEvaluatorTest extends TestCase { 
    8   private static PokerHand FOUR_OF_A_KIND = new PokerHand( 
    9       new Card[] { 
    10           new Card(Suit.CLUBS, Face.EIGHT), 
    11           new Card(Suit.HEARTS, Face.ACE), 
    12           new Card(Suit.SPADES, Face.EIGHT), 
    13           new Card(Suit.HEARTS, Face.EIGHT), 
    14           new Card(Suit.DIAMONDS, Face.EIGHT) 
    15       } 
    16       ); 
    17    
    18   private static PokerHand THREE_OF_A_KIND = new PokerHand( 
    19       new Card[] { 
    20           new Card(Suit.CLUBS, Face.EIGHT), 
    21           new Card(Suit.HEARTS, Face.ACE), 
    22           new Card(Suit.SPADES, Face.TWO), 
    23           new Card(Suit.HEARTS, Face.EIGHT), 
    24           new Card(Suit.DIAMONDS, Face.EIGHT) 
    25       } 
    26       ); 
     10   private static PokerHand FOUR_OF_A_KIND = new PokerHand(new Card[] { 
     11         new Card(Suit.CLUBS, Face.EIGHT), new Card(Suit.HEARTS, Face.ACE), 
     12         new Card(Suit.SPADES, Face.EIGHT), new Card(Suit.HEARTS, Face.EIGHT), 
     13         new Card(Suit.DIAMONDS, Face.EIGHT) }); 
    2714 
    28   private static PokerHand FULL_HOUSE = new PokerHand( 
    29       new Card[] { 
    30           new Card(Suit.CLUBS, Face.EIGHT), 
    31           new Card(Suit.HEARTS, Face.ACE), 
    32           new Card(Suit.SPADES, Face.ACE), 
    33           new Card(Suit.HEARTS, Face.EIGHT), 
    34           new Card(Suit.DIAMONDS, Face.EIGHT) 
    35       } 
    36       ); 
     15   private static PokerHand THREE_OF_A_KIND = new PokerHand(new Card[] { 
     16         new Card(Suit.CLUBS, Face.EIGHT), new Card(Suit.HEARTS, Face.ACE), 
     17         new Card(Suit.SPADES, Face.TWO), new Card(Suit.HEARTS, Face.EIGHT), 
     18         new Card(Suit.DIAMONDS, Face.EIGHT) }); 
    3719 
    38   private static PokerHand TWO_PAIR = new PokerHand( 
    39       new Card[] { 
    40           new Card(Suit.CLUBS, Face.EIGHT), 
    41           new Card(Suit.HEARTS, Face.ACE), 
    42           new Card(Suit.SPADES, Face.ACE), 
    43           new Card(Suit.HEARTS, Face.EIGHT), 
    44           new Card(Suit.DIAMONDS, Face.NINE) 
    45       } 
    46       ); 
     20   private static PokerHand FULL_HOUSE = new PokerHand(new Card[] { 
     21         new Card(Suit.CLUBS, Face.EIGHT), new Card(Suit.HEARTS, Face.ACE), 
     22         new Card(Suit.SPADES, Face.ACE), new Card(Suit.HEARTS, Face.EIGHT), 
     23         new Card(Suit.DIAMONDS, Face.EIGHT) }); 
    4724 
    48   private static PokerHand FLUSH = new PokerHand( 
    49       new Card[] { 
    50           new Card(Suit.HEARTS, Face.EIGHT), 
    51           new Card(Suit.HEARTS, Face.ACE), 
    52           new Card(Suit.HEARTS, Face.TWO), 
    53           new Card(Suit.HEARTS, Face.SIX), 
    54           new Card(Suit.HEARTS, Face.NINE) 
    55       } 
    56       ); 
    57    
    58   private static PokerHand ROYAL_FLUSH = new PokerHand( 
    59       new Card[] { 
    60           new Card(Suit.DIAMONDS, Face.ACE), 
    61           new Card(Suit.DIAMONDS, Face.JACK), 
    62           new Card(Suit.DIAMONDS, Face.KING), 
    63           new Card(Suit.DIAMONDS, Face.TEN), 
    64           new Card(Suit.DIAMONDS, Face.QUEEN) 
    65       } 
    66       ); 
     25   private static PokerHand TWO_PAIR = new PokerHand(new Card[] { 
     26         new Card(Suit.CLUBS, Face.EIGHT), new Card(Suit.HEARTS, Face.ACE), 
     27         new Card(Suit.SPADES, Face.ACE), new Card(Suit.HEARTS, Face.EIGHT), 
     28         new Card(Suit.DIAMONDS, Face.NINE) }); 
    6729 
    68   private static PokerHand STRAIGHT_FLUSH = new PokerHand( 
    69       new Card[] { 
    70           new Card(Suit.SPADES, Face.ACE), 
    71           new Card(Suit.SPADES, Face.TWO), 
    72           new Card(Suit.SPADES, Face.THREE), 
    73           new Card(Suit.SPADES, Face.FOUR), 
    74           new Card(Suit.SPADES, Face.FIVE) 
    75       } 
    76       ); 
     30   private static PokerHand FLUSH = new PokerHand(new Card[] { 
     31         new Card(Suit.HEARTS, Face.EIGHT), new Card(Suit.HEARTS, Face.ACE), 
     32         new Card(Suit.HEARTS, Face.TWO), new Card(Suit.HEARTS, Face.SIX), 
     33         new Card(Suit.HEARTS, Face.NINE) }); 
    7734 
    78   private static PokerHand STRAIGHT = new PokerHand( 
    79       new Card[] { 
    80           new Card(Suit.SPADES, Face.ACE), 
    81           new Card(Suit.HEARTS, Face.TWO), 
    82           new Card(Suit.SPADES, Face.THREE), 
    83           new Card(Suit.SPADES, Face.FOUR), 
    84           new Card(Suit.DIAMONDS, Face.FIVE) 
    85       } 
    86       ); 
    87    
    88   private static PokerHand NONE = new PokerHand( 
    89       new Card[] { 
    90           new Card(Suit.SPADES, Face.ACE), 
    91           new Card(Suit.HEARTS, Face.SEVEN), 
    92           new Card(Suit.SPADES, Face.THREE), 
    93           new Card(Suit.SPADES, Face.FOUR), 
    94           new Card(Suit.DIAMONDS, Face.FIVE) 
    95       } 
    96       ); 
    97    
    98   private PokerHandEvaluator evaluator; 
    99   protected void setUp() throws Exception { 
    100     evaluator = new PokerHandEvaluatorImpl(); 
    101   } 
    102    
    103   public void testFourOfAKind() { 
    104     assertEquals(PokerHandType.FOUR_OF_A_KIND,  
    105         evaluator.evaluateHand(FOUR_OF_A_KIND)); 
    106      
    107     Assert.assertNotEquals(PokerHandType.FOUR_OF_A_KIND,  
    108         evaluator.evaluateHand(THREE_OF_A_KIND)); 
     35   private static PokerHand ROYAL_FLUSH = new PokerHand(new Card[] { 
     36         new Card(Suit.DIAMONDS, Face.ACE), new Card(Suit.DIAMONDS, Face.JACK), 
     37         new Card(Suit.DIAMONDS, Face.KING), new Card(Suit.DIAMONDS, Face.TEN), 
     38         new Card(Suit.DIAMONDS, Face.QUEEN) }); 
    10939 
    110     Assert.assertNotEquals(PokerHandType.FOUR_OF_A_KIND,  
    111         evaluator.evaluateHand(FULL_HOUSE)); 
     40   private static PokerHand STRAIGHT_FLUSH = new PokerHand(new Card[] { 
     41         new Card(Suit.SPADES, Face.ACE), new Card(Suit.SPADES, Face.TWO), 
     42         new Card(Suit.SPADES, Face.THREE), new Card(Suit.SPADES, Face.FOUR), 
     43         new Card(Suit.SPADES, Face.FIVE) }); 
    11244 
    113     Assert.assertNotEquals(PokerHandType.FOUR_OF_A_KIND,  
    114         evaluator.evaluateHand(TWO_PAIR)); 
    115   } 
    116    
    117   public void testThreeOfAKind() { 
    118     assertEquals(PokerHandType.THREE_OF_A_KIND,  
    119         evaluator.evaluateHand(THREE_OF_A_KIND)); 
    120      
    121     Assert.assertNotEquals(PokerHandType.THREE_OF_A_KIND,  
    122         evaluator.evaluateHand(FOUR_OF_A_KIND)); 
    123      
    124     Assert.assertNotEquals(PokerHandType.THREE_OF_A_KIND,  
    125         evaluator.evaluateHand(FULL_HOUSE)); 
     45   private static PokerHand STRAIGHT = new PokerHand(new Card[] { 
     46         new Card(Suit.SPADES, Face.ACE), new Card(Suit.HEARTS, Face.TWO), 
     47         new Card(Suit.SPADES, Face.THREE), new Card(Suit.SPADES, Face.FOUR), 
     48         new Card(Suit.DIAMONDS, Face.FIVE) }); 
    12649 
    127     Assert.assertNotEquals(PokerHandType.THREE_OF_A_KIND,  
    128         evaluator.evaluateHand(TWO_PAIR)); 
    129   } 
    130    
    131   public void testTwoPair() { 
    132     assertEquals(PokerHandType.TWO_PAIR,  
    133         evaluator.evaluateHand(TWO_PAIR)); 
    134      
    135     Assert.assertNotEquals(PokerHandType.TWO_PAIR,  
    136         evaluator.evaluateHand(THREE_OF_A_KIND)); 
     50   private static PokerHand NONE = new PokerHand(new Card[] { 
     51         new Card(Suit.SPADES, Face.ACE), new Card(Suit.HEARTS, Face.SEVEN), 
     52         new Card(Suit.SPADES, Face.THREE), new Card(Suit.SPADES, Face.FOUR), 
     53         new Card(Suit.DIAMONDS, Face.FIVE) }); 
    13754 
    138     Assert.assertNotEquals(PokerHandType.TWO_PAIR, 
    139         evaluator.evaluateHand(FULL_HOUSE)); 
    140      
    141     Assert.assertNotEquals(PokerHandType.TWO_PAIR, 
    142         evaluator.evaluateHand(FOUR_OF_A_KIND)); 
    143   } 
    144    
    145   public void testFlush() { 
    146     assertEquals(PokerHandType.FLUSH,  
    147         evaluator.evaluateHand(FLUSH)); 
    148      
    149     Assert.assertNotEquals(PokerHandType.FLUSH,  
    150         evaluator.evaluateHand(THREE_OF_A_KIND)); 
     55   private PokerHandEvaluator evaluator; 
    15156 
    152     Assert.assertNotEquals(PokerHandType.FLUSH, 
    153         evaluator.evaluateHand(FULL_HOUSE)); 
    154      
    155     Assert.assertNotEquals(PokerHandType.FLUSH, 
    156         evaluator.evaluateHand(FOUR_OF_A_KIND)); 
    157   } 
    158    
    159   public void testRoyalFlush() { 
    160     assertEquals(PokerHandType.ROYAL_FLUSH,  
    161         evaluator.evaluateHand(ROYAL_FLUSH)); 
    162      
    163     Assert.assertNotEquals(PokerHandType.ROYAL_FLUSH,  
    164         evaluator.evaluateHand(FLUSH)); 
     57   @Override 
     58   @Before 
     59   protected void setUp() throws Exception { 
     60      evaluator = new PokerHandEvaluatorImpl(); 
     61   } 
    16562 
    166     Assert.assertNotEquals(PokerHandType.ROYAL_FLUSH, 
    167         evaluator.evaluateHand(FULL_HOUSE)); 
    168      
    169     Assert.assertNotEquals(PokerHandType.ROYAL_FLUSH, 
    170         evaluator.evaluateHand(FOUR_OF_A_KIND)); 
    171   } 
    172    
    173   public void testStraightFlush() { 
    174     assertEquals(PokerHandType.STRAIGHT_FLUSH,  
    175         evaluator.evaluateHand(STRAIGHT_FLUSH)); 
    176      
    177     Assert.assertNotEquals(PokerHandType.STRAIGHT_FLUSH,  
    178         evaluator.evaluateHand(FLUSH)); 
     63   @Test 
     64   public void testFourOfAKind() { 
     65      assertEquals(PokerHandType.FOUR_OF_A_KIND, evaluator 
     66                        .evaluateHand(FOUR_OF_A_KIND)); 
    17967 
    180     Assert.assertNotEquals(PokerHandType.STRAIGHT_FLUSH, 
    181         evaluator.evaluateHand(ROYAL_FLUSH)); 
    182      
    183     Assert.assertNotEquals(PokerHandType.STRAIGHT_FLUSH, 
    184         evaluator.evaluateHand(STRAIGHT)); 
    185   } 
    186    
    187   public void testStraight() { 
    188     assertEquals(PokerHandType.STRAIGHT,  
    189         evaluator.evaluateHand(STRAIGHT)); 
    190      
    191     Assert.assertNotEquals(PokerHandType.STRAIGHT,  
    192         evaluator.evaluateHand(STRAIGHT_FLUSH)); 
     68      assertNotEquals(PokerHandType.FOUR_OF_A_KIND, evaluator 
     69                        .evaluateHand(THREE_OF_A_KIND)); 
    19370 
    194     Assert.assertNotEquals(PokerHandType.STRAIGHT, 
    195         evaluator.evaluateHand(ROYAL_FLUSH)); 
    196      
    197     Assert.assertNotEquals(PokerHandType.STRAIGHT, 
    198         evaluator.evaluateHand(FLUSH)); 
    199   } 
    200    
    201   public void testNone() { 
    202     assertEquals(PokerHandType.NONE,  
    203         evaluator.evaluateHand(NONE)); 
    204      
    205     Assert.assertNotEquals(PokerHandType.NONE,  
    206         evaluator.evaluateHand(STRAIGHT_FLUSH)); 
     71      assertNotEquals(PokerHandType.FOUR_OF_A_KIND, evaluator 
     72                        .evaluateHand(FULL_HOUSE)); 
    20773 
    208     Assert.assertNotEquals(PokerHandType.NONE, 
    209         evaluator.evaluateHand(ROYAL_FLUSH)); 
    210      
    211     Assert.assertNotEquals(PokerHandType.NONE, 
    212         evaluator.evaluateHand(FLUSH)); 
    213   } 
     74      assertNotEquals(PokerHandType.FOUR_OF_A_KIND, evaluator 
     75                        .evaluateHand(TWO_PAIR)); 
     76   } 
     77 
     78   @Test 
     79   public void testThreeOfAKind() { 
     80      assertEquals(PokerHandType.THREE_OF_A_KIND, evaluator 
     81                        .evaluateHand(THREE_OF_A_KIND)); 
     82 
     83      assertNotEquals(PokerHandType.THREE_OF_A_KIND, evaluator 
     84                        .evaluateHand(FOUR_OF_A_KIND)); 
     85 
     86      assertNotEquals(PokerHandType.THREE_OF_A_KIND, evaluator 
     87                        .evaluateHand(FULL_HOUSE)); 
     88 
     89      assertNotEquals(PokerHandType.THREE_OF_A_KIND, evaluator 
     90                        .evaluateHand(TWO_PAIR)); 
     91   } 
     92 
     93   @Test 
     94   public void testTwoPair() { 
     95      assertEquals(PokerHandType.TWO_PAIR, evaluator.evaluateHand(TWO_PAIR)); 
     96 
     97      assertNotEquals(PokerHandType.TWO_PAIR, evaluator 
     98                        .evaluateHand(THREE_OF_A_KIND)); 
     99 
     100      assertNotEquals(PokerHandType.TWO_PAIR, evaluator 
     101                        .evaluateHand(FULL_HOUSE)); 
     102 
     103      assertNotEquals(PokerHandType.TWO_PAIR, evaluator 
     104                        .evaluateHand(FOUR_OF_A_KIND)); 
     105   } 
     106 
     107   @Test 
     108   public void testFlush() { 
     109      assertEquals(PokerHandType.FLUSH, evaluator.evaluateHand(FLUSH)); 
     110 
     111      assertNotEquals(PokerHandType.FLUSH, evaluator 
     112                        .evaluateHand(THREE_OF_A_KIND)); 
     113 
     114      assertNotEquals(PokerHandType.FLUSH, evaluator.evaluateHand(FULL_HOUSE)); 
     115 
     116      assertNotEquals(PokerHandType.FLUSH, evaluator 
     117                        .evaluateHand(FOUR_OF_A_KIND)); 
     118   } 
     119 
     120   @Test 
     121   public void testRoyalFlush() { 
     122      assertEquals(PokerHandType.ROYAL_FLUSH, evaluator 
     123                        .evaluateHand(ROYAL_FLUSH)); 
     124 
     125      assertNotEquals(PokerHandType.ROYAL_FLUSH, evaluator.evaluateHand(FLUSH)); 
     126 
     127      assertNotEquals(PokerHandType.ROYAL_FLUSH, evaluator 
     128                        .evaluateHand(FULL_HOUSE)); 
     129 
     130      assertNotEquals(PokerHandType.ROYAL_FLUSH, evaluator 
     131                        .evaluateHand(FOUR_OF_A_KIND)); 
     132   } 
     133 
     134   @Test 
     135   public void testStraightFlush() { 
     136      assertEquals(PokerHandType.STRAIGHT_FLUSH, evaluator 
     137                        .evaluateHand(STRAIGHT_FLUSH)); 
     138 
     139      assertNotEquals(PokerHandType.STRAIGHT_FLUSH, evaluator 
     140                        .evaluateHand(FLUSH)); 
     141 
     142      assertNotEquals(PokerHandType.STRAIGHT_FLUSH, evaluator 
     143                        .evaluateHand(ROYAL_FLUSH)); 
     144 
     145      assertNotEquals(PokerHandType.STRAIGHT_FLUSH, evaluator 
     146                        .evaluateHand(STRAIGHT)); 
     147   } 
     148 
     149   @Test 
     150   public void testStraight() { 
     151      assertEquals(PokerHandType.STRAIGHT, evaluator.evaluateHand(STRAIGHT)); 
     152 
     153      assertNotEquals(PokerHandType.STRAIGHT, evaluator 
     154                        .evaluateHand(STRAIGHT_FLUSH)); 
     155 
     156      assertNotEquals(PokerHandType.STRAIGHT, evaluator 
     157                        .evaluateHand(ROYAL_FLUSH)); 
     158 
     159      assertNotEquals(PokerHandType.STRAIGHT, evaluator.evaluateHand(FLUSH)); 
     160   } 
     161 
     162   @Test 
     163   public void testNone() { 
     164      assertEquals(PokerHandType.NONE, evaluator.evaluateHand(NONE)); 
     165 
     166      assertNotEquals(PokerHandType.NONE, evaluator 
     167                        .evaluateHand(STRAIGHT_FLUSH)); 
     168 
     169      assertNotEquals(PokerHandType.NONE, evaluator.evaluateHand(ROYAL_FLUSH)); 
     170 
     171      assertNotEquals(PokerHandType.NONE, evaluator.evaluateHand(FLUSH)); 
     172   } 
    214173} 
  • trunk/Chapter16/SpringPizza/.classpath

    r31 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<classpath> 
    3         <classpathentry kind="src" path="src/test/java"/> 
    4         <classpathentry kind="src" path="src/main/java"/> 
    5         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    6         <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> 
    7         <classpathentry kind="output" path="bin"/> 
     2  <classpathentry kind="src" path="src/main/java"/> 
     3  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> 
     4  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> 
     5  <classpathentry kind="output" path="target/classes"/> 
     6  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
     7  <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar"/> 
     8  <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar"/> 
     9  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2-sources.jar"/> 
     10  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webflow/1.0.3/spring-webflow-1.0.3.jar"/> 
     11  <classpathentry kind="var" path="M2_REPO/junit-addons/junit-addons/1.4/junit-addons-1.4.jar"/> 
     12  <classpathentry kind="var" path="M2_REPO/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"/> 
     13  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> 
     14  <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9/ognl-2.6.9.jar"/> 
     15  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-binding/1.0.3/spring-binding-1.0.3.jar"/> 
     16  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0.4/spring-context-2.0.4.jar"/> 
     17  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.5.3/spring-2.5.3.jar"/> 
     18  <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/> 
     19  <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> 
     20  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/> 
     21  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aspects/2.0.4/spring-aspects-2.0.4.jar"/> 
     22  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/> 
     23  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/> 
     24  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.3/spring-core-2.5.3.jar"/> 
     25  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0.4/spring-beans-2.0.4.jar"/> 
     26  <classpathentry kind="var" path="M2_REPO/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.jar"/> 
     27  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/2.0.4/spring-web-2.0.4.jar"/> 
    828</classpath> 
  • trunk/Chapter16/SpringPizza/.project

    r31 r181  
    1 <?xml version="1.0" encoding="UTF-8"?> 
    21<projectDescription> 
    3         <name>SpringPizza</name> 
    4         <comment></comment> 
    5         <projects> 
    6         </projects> 
    7         <buildSpec> 
    8                 <buildCommand> 
    9                         <name>org.eclipse.jdt.core.javabuilder</name> 
    10                         <arguments> 
    11                         </arguments> 
    12                 </buildCommand> 
    13                 <buildCommand> 
    14                         <name>org.springframework.ide.eclipse.core.springbuilder</name> 
    15                         <arguments> 
    16                         </arguments> 
    17                 </buildCommand> 
    18                 <buildCommand> 
    19                         <name>org.maven.ide.eclipse.maven2Builder</name> 
    20                         <arguments> 
    21                         </arguments> 
    22                 </buildCommand> 
    23         </buildSpec> 
    24         <natures> 
    25                 <nature>org.eclipse.jdt.core.javanature</nature> 
    26                 <nature>org.maven.ide.eclipse.maven2Nature</nature> 
    27                 <nature>org.springframework.ide.eclipse.core.springnature</nature> 
    28         </natures> 
     2  <name>SpringPizza</name> 
     3  <comment/> 
     4  <projects/> 
     5  <buildSpec> 
     6    <buildCommand> 
     7      <name>org.eclipse.jdt.core.javabuilder</name> 
     8    </buildCommand> 
     9    <buildCommand> 
     10      <name>org.springframework.ide.eclipse.core.springbuilder</name> 
     11    </buildCommand> 
     12    <buildCommand> 
     13      <name>org.maven.ide.eclipse.maven2Builder</name> 
     14    </buildCommand> 
     15  </buildSpec> 
     16  <natures> 
     17    <nature>org.eclipse.jdt.core.javanature</nature> 
     18    <nature>org.maven.ide.eclipse.maven2Nature</nature> 
     19    <nature>org.springframework.ide.eclipse.core.springnature</nature> 
     20  </natures> 
    2921</projectDescription> 
  • trunk/RoadRantz/persistence/jpa/src/main/java/com/roadrantz/dao/jpa/PureJpaRantDao.java

    r179 r181  
    5757   public List<Rant> getRantsForDay(LocalDate day) { 
    5858      return entityManager.createQuery(SELECT_RANTS_FOR_DAY).setParameter(1, 
    59             day).getResultList(); 
     59                        day).getResultList(); 
    6060   } 
    6161 
     
    6363      @SuppressWarnings("unchecked") 
    6464      List<Vehicle> vehicles = entityManager.createQuery( 
    65             SELECT_VEHICLE_BY_PLATE).setParameter(1, state).setParameter(2, 
    66             plateNumber).getResultList(); 
     65                        SELECT_VEHICLE_BY_PLATE).setParameter(1, state) 
     66                        .setParameter(2, plateNumber).getResultList(); 
    6767 
    6868      return vehicles.size() > 0 ? vehicles.get(0) : null; 
     
    7676      @SuppressWarnings("unchecked") 
    7777      List<Motorist> motorists = entityManager.createQuery( 
    78             SELECT_MOTORIST_BY_EMAIL).setParameter(1, email).getResultList(); 
     78                        SELECT_MOTORIST_BY_EMAIL).setParameter(1, email) 
     79                        .getResultList(); 
    7980 
    8081      return motorists.size() > 0 ? motorists.get(0) : null; 
  • trunk/RoadRantz/service/src/main/java/com/roadrantz/service/RantServiceImpl.java

    r178 r181  
    3434      // check for existing vehicle with same plates 
    3535      Vehicle existingVehicle = rantDao.findVehicleByPlate(rantVehicle 
    36             .getState(), rantVehicle.getPlateNumber()); 
     36                        .getState(), rantVehicle.getPlateNumber()); 
    3737 
    3838      if (existingVehicle != null) { 
     
    5252   @Transactional(propagation = Propagation.REQUIRED) 
    5353   public void addMotorist(Motorist motorist) 
    54          throws MotoristAlreadyExistsException { 
     54                     throws MotoristAlreadyExistsException { 
    5555      Motorist existingMotorist = rantDao.getMotoristByEmail(motorist 
    56             .getUsername()); 
     56                        .getUsername()); 
    5757      if (existingMotorist != null) { 
    5858         throw new MotoristAlreadyExistsException(); 
    5959      } 
    6060 
    61       UserPrivilege privilege = new UserPrivilege("MOTORIST"); 
     61      UserPrivilege privilege = new UserPrivilege("ROLE_MOTORIST"); 
    6262      privilege.setUsername(motorist.getUsername()); 
    6363      privilege.setUser(motorist); 
     
    6767      for (Vehicle vehicle : motorist.getVehicles()) { 
    6868         LOGGER.debug("Checking for existing vehicle: " + vehicle.getState() 
    69                + " :: " + vehicle.getPlateNumber()); 
     69                           + " :: " + vehicle.getPlateNumber()); 
    7070 
    7171         Vehicle existingVehicle = rantDao.findVehicleByPlate(vehicle 
    72                .getState(), vehicle.getPlateNumber()); 
     72                           .getState(), vehicle.getPlateNumber()); 
    7373 
    7474         if (existingVehicle == null) { 
     
    7878         } else { 
    7979            LOGGER.debug("Found existing vehicle: " + vehicle.getState() 
    80                   + " :: " + vehicle.getPlateNumber()); 
     80                              + " :: " + vehicle.getPlateNumber()); 
    8181            existingVehicle.setMotorist(motorist); 
    8282            vehicles.add(existingVehicle); 
     
    9191   public List<Rant> getRantsForVehicle(Vehicle requestedVehicle) { 
    9292      Vehicle vehicle = rantDao.findVehicleByPlate(requestedVehicle.getState(), 
    93             requestedVehicle.getPlateNumber()); 
     93                        requestedVehicle.getPlateNumber()); 
    9494 
    9595      return vehicle.getRants(); 
  • trunk/RoadRantz/web/springmvc/pom.xml

    r172 r181  
    11<?xml version="1.0"?> 
    2 <project xmlns="http://maven.apache.org/POM/4.0.0"   
    3          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   
    4          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">   
     2<project xmlns="http://maven.apache.org/POM/4.0.0" 
     3   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     4   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
    55   <parent> 
    66      <groupId>com.roadrantz</groupId> 
     
    2020         <id>spring-snapshot</id> 
    2121         <name>Spring Portfolio Snapshot Repository</name> 
    22          <url>http://s3.amazonaws.com/maven.springframework.org/snapshot</url> 
     22         <url> 
     23            http://s3.amazonaws.com/maven.springframework.org/snapshot 
     24         </url> 
    2325      </repository> 
    2426      <repository> 
     
    3739            <version>6.1.1</version> 
    3840            <configuration> 
    39               <scanIntervalSeconds>10</scanIntervalSeconds> 
    40               <webAppSourceDirectory> 
    41                 src/main/webapp 
    42               </webAppSourceDirectory> 
    43               <connectors> 
    44                 <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> 
    45                   <port>8080</port> 
    46                   <maxIdleTime>60000</maxIdleTime> 
    47                 </connector> 
    48                 <connector implementation="org.mortbay.jetty.security.SslSocketConnector"> 
    49                   <port>8443</port> 
    50                   <maxIdleTime>30000</maxIdleTime> 
    51                   <keystore>.jettykeystore</keystore> 
    52                   <password>habuma</password> 
    53                   <keyPassword>habuma</keyPassword> 
    54                 </connector> 
    55               </connectors> 
     41               <scanIntervalSeconds>10</scanIntervalSeconds> 
     42               <webAppSourceDirectory> 
     43                  src/main/webapp 
     44               </webAppSourceDirectory> 
     45               <connectors> 
     46                  <connector 
     47                     implementation="org.mortbay.jetty.nio.SelectChannelConnector"> 
     48                     <port>8080</port> 
     49                     <maxIdleTime>60000</maxIdleTime> 
     50                  </connector> 
     51                  <connector 
     52                     implementation="org.mortbay.jetty.security.SslSocketConnector"> 
     53                     <port>8443</port> 
     54                     <maxIdleTime>30000</maxIdleTime> 
     55                     <keystore>.jettykeystore</keystore> 
     56                     <password>habuma</password> 
     57                     <keyPassword>habuma</keyPassword> 
     58                  </connector> 
     59               </connectors> 
    5660            </configuration> 
    5761         </plugin> 
     
    9296         <groupId>org.springframework.security</groupId> 
    9397         <artifactId>spring-security-core</artifactId> 
    94          <version>2.0-SNAPSHOT-MCW</version> 
     98         <version>2.0.0</version> 
    9599      </dependency> 
    96100      <dependency> 
    97101         <groupId>org.springframework.security</groupId> 
    98102         <artifactId>spring-security-core-tiger</artifactId> 
    99          <version>2.0-SNAPSHOT</version> 
     103         <version>2.0.0</version> 
    100104      </dependency> 
    101105      <dependency> 
    102106         <groupId>org.springframework.security</groupId> 
    103107         <artifactId>spring-security-taglibs</artifactId> 
    104          <version>2.0-SNAPSHOT</version> 
     108         <version>2.0.0</version> 
    105109      </dependency> 
    106110      <dependency> 
     
    109113         <version>1.0.5</version> 
    110114         <exclusions> 
    111            <exclusion> 
    112              <groupId>org.springframework</groupId> 
    113              <artifactId>spring-beans</artifactId> 
    114            </exclusion> 
    115            <exclusion> 
    116              <groupId>org.springframework</groupId> 
    117              <artifactId>spring-core</artifactId> 
    118            </exclusion> 
    119            <exclusion> 
    120              <groupId>org.springframework</groupId> 
    121              <artifactId>spring-context</artifactId> 
    122            </exclusion> 
    123            <exclusion> 
    124              <groupId>org.springframework</groupId> 
    125              <artifactId>spring-web</artifactId> 
    126            </exclusion> 
     115            <exclusion> 
     116               <groupId>org.springframework</groupId> 
     117               <artifactId>spring-beans</artifactId> 
     118            </exclusion> 
     119            <exclusion> 
     120               <groupId>org.springframework</groupId> 
     121               <artifactId>spring-core</artifactId> 
     122            </exclusion> 
     123            <exclusion> 
     124               <groupId>org.springframework</groupId> 
     125               <artifactId>spring-context</artifactId> 
     126            </exclusion> 
     127            <exclusion> 
     128               <groupId>org.springframework</groupId> 
     129               <artifactId>spring-web</artifactId> 
     130            </exclusion> 
    127131         </exclusions> 
    128132      </dependency> 
     
    145149 
    146150      <dependency> 
     151         <groupId>aspectj</groupId> 
     152         <artifactId>aspectjrt</artifactId> 
     153         <version>1.5.4</version> 
     154      </dependency> 
     155      <dependency> 
     156         <groupId>cglib</groupId> 
     157         <artifactId>cglib-nodep</artifactId> 
     158         <version>2.1_3</version> 
     159      </dependency> 
     160      <dependency> 
     161         <groupId>javax.annotation</groupId> 
     162         <artifactId>jsr250-api</artifactId> 
     163         <version>1.0</version> 
     164      </dependency> 
     165 
     166      <dependency> 
    147167         <groupId>javax.servlet</groupId> 
    148168         <artifactId>servlet-api</artifactId> 
  • trunk/RoadRantz/web/springmvc/src/main/java/com/roadrantz/mvc/AddRantFormController.java

    r172 r181  
    22 
    33import org.springframework.beans.factory.annotation.Autowired; 
     4import org.springframework.security.annotation.Secured; 
    45import org.springframework.stereotype.Controller; 
    56import org.springframework.ui.ModelMap; 
     
    1213import com.roadrantz.service.RantService; 
    1314 
    14 @Controller  
     15@Controller 
     16@Secured("ROLE_MOTORIST") 
    1517@RequestMapping("/addRant.htm") 
    1618public class AddRantFormController { 
  • trunk/RoadRantz/web/springmvc/src/main/resources/log4j.properties

    r173 r181  
    77log4j.category.com.roadrantz=DEBUG 
    88log4j.category.org.springframework.security=WARN 
     9log4j.category.org.springframework=WARN 
    910log4j.category.org.hibernate=WARN 
    1011log4j.category.oracle.toplink=WARN 
  • trunk/RoadRantz/web/springmvc/src/main/resources/roadrantz-security.xml

    r175 r181  
    1414    --> 
    1515   <http auto-config="true"> 
    16       <intercept-url pattern="/addRant.htm" access="ROLE_MOTORIST" /> 
    1716      <intercept-url pattern="/home.htm" requires-channel="http" /> 
    1817      <intercept-url pattern="/login.htm" requires-channel="https" /> 
     
    2221   <authentication-provider user-service-ref="userService" /> 
    2322 
     23   <global-method-security secured-annotations="enabled" />  
     24 
    2425   <jdbc-user-service id="userService" data-source-ref="dataSource" /> 
    2526   <!--  
  • trunk/RoadRantz/web/springmvc/src/main/webapp/WEB-INF/jsp/rantzTemplate.jsp

    r180 r181  
    6363            </security:authorize> 
    6464            <security:authorize ifNotGranted="ROLE_ANONYMOUS"> 
    65               <div style="font-family:arial;color:white;font-size:9pt;width:230px;margin-left:10px;"> 
     65              <div style="font-family:arial;color:white;font-size:10pt;width:230px;margin-left:10px;text-align:center;"> 
    6666                <br/> 
    67                 <p>Logged in</p> 
    68                 <a href="j_spring_security_logout">Log out</a> 
     67                <p>Welcome, <security:authentication property="principal.username"/>!</p> 
     68                <a href="j_spring_security_logout" style="color:white;">Log out</a> 
    6969              </div> 
    7070            </security:authorize> 
  • trunk/Spitter/pom.xml

    r109 r181  
    2121      <finalName>Spitter</finalName> 
    2222      <plugins> 
     23            <!-- Start Jetty on pre-integration-test and shut it down on post-integration-test --> 
     24            <plugin> 
     25               <groupId>org.codehaus.cargo</groupId> 
     26               <artifactId>cargo-maven2-plugin</artifactId> 
     27               <configuration> 
     28                  <properties> 
     29                     <cargo.jvmargs>-javaagent:/Users/wallsc/tomcat/spring/spring-agent.jar </cargo.jvmargs> 
     30                  </properties> 
     31                  <container> 
     32                     <systemProperties> 
     33                        <org.apache.commons.logging.Log> 
     34                           org.apache.commons.logging.impl.SimpleLog 
     35                        </org.apache.commons.logging.Log> 
     36                     </systemProperties> 
     37                  </container> 
     38               </configuration> 
     39            </plugin> 
     40 
    2341         <!-- Exclude the service integration tests from the normal build. 
    2442            Instead, run those with the ITest profile --> 
  • trunk/Spitter/src/main/webapp/WEB-INF/web.xml

    r94 r181  
    1414            classpath:spitter-persistence-jdbc.xml 
    1515            classpath:spitter-setup.xml  
    16             classpath:spitter-misc.xml 
    1716        </param-value> 
    1817    </context-param> 
  • trunk/pom.xml

    r113 r181  
    44  <groupId>com.springinaction</groupId> 
    55  <artifactId>sia</artifactId> 
    6   <version>3.0-SNAPSHOT</version> 
     6  <version>2.0</version> 
    77  <packaging>pom</packaging> 
    88  <name>Spring in Action 2E, Examples</name> 
     
    1010 
    1111  <properties> 
    12     <spring.version>2.5.1</spring.version> 
     12    <spring.version>2.5.3</spring.version> 
    1313  </properties> 
    1414 
     
    1919      <version>${spring.version}</version> 
    2020      <scope>compile</scope> 
     21      <exclusions> 
     22        <exclusion> 
     23          <groupId>avalon-framework</groupId> 
     24          <artifactId>avalon-framework</artifactId> 
     25        </exclusion> 
     26        <exclusion> 
     27          <groupId>javax.servlet</groupId> 
     28          <artifactId>servlet-api</artifactId> 
     29        </exclusion> 
     30        <exclusion> 
     31          <groupId>logkit</groupId> 
     32          <artifactId>logkit</artifactId> 
     33        </exclusion> 
     34      </exclusions> 
    2135    </dependency> 
    2236    <dependency> 
     
    2943      <groupId>junit</groupId> 
    3044      <artifactId>junit</artifactId> 
    31       <version>3.8.1</version> 
     45      <version>4.4</version> 
    3246      <scope>test</scope> 
    3347    </dependency>     
     
    3953    </dependency>     
    4054  </dependencies> 
     55 
     56  <dependencyManagement> 
     57    <dependencies> 
     58          <dependency> 
     59                <groupId>org.springframework</groupId> 
     60                <artifactId>spring-core</artifactId> 
     61                <version>${spring.version}</version> 
     62          </dependency> 
     63        </dependencies> 
     64  </dependencyManagement> 
    4165 
    4266  <modules>