[jcatapult] r2374 committed - Changed so that MySQL connector is not a compile-time dependency but i...

0 views

Skip to first unread message

codesite...@google.com

unread,

Sep 28, 2009, 1:52:03 PM9/28/09

to jcatapul...@googlegroups.com

Revision: 2374
Author: bpontarelli
Date: Mon Sep 28 10:50:47 2009
Log: Changed so that MySQL connector is not a compile-time dependency but
is a compile-only dependency. This will allow applications to not ship with
that JAR so that they don't violate the GPL
http://code.google.com/p/jcatapult/source/detail?r=2374

Modified:
/jcatapult-persistence/trunk/.classpath
/jcatapult-persistence/trunk/jcatapult-persistence.eml
/jcatapult-persistence/trunk/jcatapult-persistence.iml
/jcatapult-persistence/trunk/jcatapult-persistence.ipr
/jcatapult-persistence/trunk/project.xml

/jcatapult-persistence/trunk/src/java/test/unit/org/jcatapult/servlet/JCatapultFilterTest.java

=======================================
--- /jcatapult-persistence/trunk/.classpath Mon May 11 18:49:06 2009
+++ /jcatapult-persistence/trunk/.classpath Mon Sep 28 10:50:47 2009
@@ -1,40 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER" />
- <classpathentry kind="src" path="src/conf/main" />
- <classpathentry kind="src" path="src/conf/test/integration"
output="target/classes/test/integration" />
- <classpathentry kind="src" path="src/conf/test/unit"
output="target/classes/test/unit" />
- <classpathentry kind="src" path="src/java/main" />
- <classpathentry kind="src" path="src/java/test/integration"
output="target/classes/test/integration" />
- <classpathentry kind="src" path="src/java/test/unit"
output="target/classes/test/unit" />
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/com/google/code/guice/guice/1.0/guice-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/com/google/code/guice/guice/1.0/guice-1.0-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/com/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar"
sourcepath="/SAVANT_REPOSITORY/com/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/javax/persistence/persistence-api/1.0/persistence-api-1.0-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"
sourcepath="/SAVANT_REPOSITORY/javax/servlet/servlet-api/2.4/servlet-api-2.4-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"
sourcepath="/SAVANT_REPOSITORY/javax/transaction/jta/1.0.1B/jta-1.0.1B-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/net/java/dev/java-net-commons/java-net-commons/1.5/java-net-commons-1.5.jar"
sourcepath="/SAVANT_REPOSITORY/net/java/dev/java-net-commons/java-net-commons/1.5/java-net-commons-1.5-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/net/sourceforge/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/net/sourceforge/aopalliance/aopalliance/1.0/aopalliance-1.0-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/net/sourceforge/cglib/cglib/2.2/cglib-2.2.jar"
sourcepath="/SAVANT_REPOSITORY/net/sourceforge/cglib/cglib/2.2/cglib-2.2-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/antlr/antlr/2.7.6/antlr-2.7.6.jar"
sourcepath="/SAVANT_REPOSITORY/org/antlr/antlr/2.7.6/antlr-2.7.6-src.jar" />
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/apache/commons/commons-collections/3.1/commons-collections-3.1.jar"
sourcepath="/SAVANT_REPOSITORY/org/apache/commons/commons-collections/3.1/commons-collections-3.1-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/apache/commons/commons-configuration/1.4/commons-configuration-1.4.jar"
sourcepath="/SAVANT_REPOSITORY/org/apache/commons/commons-configuration/1.4/commons-configuration-1.4-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/apache/commons/commons-lang/2.3/commons-lang-2.3.jar"
sourcepath="/SAVANT_REPOSITORY/org/apache/commons/commons-lang/2.3/commons-lang-2.3-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/apache/commons/commons-logging/1.1/commons-logging-1.1.jar"
sourcepath="/SAVANT_REPOSITORY/org/apache/commons/commons-logging/1.1/commons-logging-1.1-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"
sourcepath="/SAVANT_REPOSITORY/org/dom4j/dom4j/1.6.1/dom4j-1.6.1-src.jar" />
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/easymock/easymock/2.2/easymock-2.2.jar"
sourcepath="/SAVANT_REPOSITORY/org/easymock/easymock/2.2/easymock-2.2-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/freemarker/freemarker/2.3.12/freemarker-2.3.12.jar"
sourcepath="/SAVANT_REPOSITORY/org/freemarker/freemarker/2.3.12/freemarker-2.3.12-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/hibernate/hibernate/3.2.6/hibernate-3.2.6.jar"
sourcepath="/SAVANT_REPOSITORY/org/hibernate/hibernate/3.2.6/hibernate-3.2.6-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/hibernate/hibernate-annotations/3.3.1/hibernate-annotations-3.3.1.jar"
sourcepath="/SAVANT_REPOSITORY/org/hibernate/hibernate-annotations/3.3.1/hibernate-annotations-3.3.1-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/hibernate/hibernate-commons-annotations/3.3.0/hibernate-commons-annotations-3.3.0.jar"
sourcepath="/SAVANT_REPOSITORY/org/hibernate/hibernate-commons-annotations/3.3.0/hibernate-commons-annotations-3.3.0-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/hibernate/hibernate-entitymanager/3.3.2/hibernate-entitymanager-3.3.2.jar"
sourcepath="/SAVANT_REPOSITORY/org/hibernate/hibernate-entitymanager/3.3.2/hibernate-entitymanager-3.3.2-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/hsqldb/hsqldb/1.8.9/hsqldb-1.8.9.jar"
sourcepath="/SAVANT_REPOSITORY/org/hsqldb/hsqldb/1.8.9/hsqldb-1.8.9-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/jboss/javassist/3.4/javassist-3.4.jar"
sourcepath="/SAVANT_REPOSITORY/org/jboss/javassist/3.4/javassist-3.4-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/jcatapult/jcatapult-core/1.0/jcatapult-core-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/org/jcatapult/jcatapult-core/1.0/jcatapult-core-1.0-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/jcatapult/jcatapult-core/1.0/jcatapult-core-test-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/org/jcatapult/jcatapult-core/1.0/jcatapult-core-test-1.0-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/joda/joda-time/joda-time/1.4/joda-time-1.4.jar"
sourcepath="/SAVANT_REPOSITORY/org/joda/joda-time/joda-time/1.4/joda-time-1.4-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/joda/joda-time/joda-time-hibernate/1.0/joda-time-hibernate-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/org/joda/joda-time/joda-time-hibernate/1.0/joda-time-hibernate-1.0-src.jar"
/>
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/junit/junit/4.4/junit-4.4.jar"
sourcepath="/SAVANT_REPOSITORY/org/junit/junit/4.4/junit-4.4-src.jar" />
- <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/objectweb/asm/asm/3.1/asm-3.1.jar"
sourcepath="/SAVANT_REPOSITORY/org/objectweb/asm/asm/3.1/asm-3.1-src.jar" />
- <classpathentry kind="output" path="target/classes/main" />
+ <classpathentry kind="src" path="src/conf/main"/>
+ <classpathentry kind="src" output="target/classes/test/integration"
path="src/conf/test/integration"/>
+ <classpathentry kind="src" output="target/classes/test/unit"
path="src/conf/test/unit"/>
+ <classpathentry kind="src" path="src/java/main"/>
+ <classpathentry kind="src" output="target/classes/test/integration"
path="src/java/test/integration"/>
+ <classpathentry kind="src" output="target/classes/test/unit"
path="src/java/test/unit"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/com/google/code/guice/guice/1.0/guice-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/com/google/code/guice/guice/1.0/guice-1.0-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/com/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar"
sourcepath="/SAVANT_REPOSITORY/com/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/javax/persistence/persistence-api/1.0/persistence-api-1.0-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"
sourcepath="/SAVANT_REPOSITORY/javax/servlet/servlet-api/2.4/servlet-api-2.4-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"
sourcepath="/SAVANT_REPOSITORY/javax/transaction/jta/1.0.1B/jta-1.0.1B-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/net/java/dev/java-net-commons/java-net-commons/1.5/java-net-commons-1.5.jar"
sourcepath="/SAVANT_REPOSITORY/net/java/dev/java-net-commons/java-net-commons/1.5/java-net-commons-1.5-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/net/sourceforge/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/net/sourceforge/aopalliance/aopalliance/1.0/aopalliance-1.0-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/net/sourceforge/cglib/cglib/2.2/cglib-2.2.jar"
sourcepath="/SAVANT_REPOSITORY/net/sourceforge/cglib/cglib/2.2/cglib-2.2-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/antlr/antlr/2.7.6/antlr-2.7.6.jar"
sourcepath="/SAVANT_REPOSITORY/org/antlr/antlr/2.7.6/antlr-2.7.6-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/apache/commons/commons-collections/3.1/commons-collections-3.1.jar"
sourcepath="/SAVANT_REPOSITORY/org/apache/commons/commons-collections/3.1/commons-collections-3.1-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/apache/commons/commons-configuration/1.4/commons-configuration-1.4.jar"
sourcepath="/SAVANT_REPOSITORY/org/apache/commons/commons-configuration/1.4/commons-configuration-1.4-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/apache/commons/commons-lang/2.3/commons-lang-2.3.jar"
sourcepath="/SAVANT_REPOSITORY/org/apache/commons/commons-lang/2.3/commons-lang-2.3-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/apache/commons/commons-logging/1.1/commons-logging-1.1.jar"
sourcepath="/SAVANT_REPOSITORY/org/apache/commons/commons-logging/1.1/commons-logging-1.1-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"
sourcepath="/SAVANT_REPOSITORY/org/dom4j/dom4j/1.6.1/dom4j-1.6.1-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/easymock/easymock/2.2/easymock-2.2.jar"
sourcepath="/SAVANT_REPOSITORY/org/easymock/easymock/2.2/easymock-2.2-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/freemarker/freemarker/2.3.12/freemarker-2.3.12.jar"
sourcepath="/SAVANT_REPOSITORY/org/freemarker/freemarker/2.3.12/freemarker-2.3.12-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/hibernate/hibernate/3.2.6/hibernate-3.2.6.jar"
sourcepath="/SAVANT_REPOSITORY/org/hibernate/hibernate/3.2.6/hibernate-3.2.6-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/hibernate/hibernate-annotations/3.3.1/hibernate-annotations-3.3.1.jar"
sourcepath="/SAVANT_REPOSITORY/org/hibernate/hibernate-annotations/3.3.1/hibernate-annotations-3.3.1-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/hibernate/hibernate-commons-annotations/3.3.0/hibernate-commons-annotations-3.3.0.jar"
sourcepath="/SAVANT_REPOSITORY/org/hibernate/hibernate-commons-annotations/3.3.0/hibernate-commons-annotations-3.3.0-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/hibernate/hibernate-entitymanager/3.3.2/hibernate-entitymanager-3.3.2.jar"
sourcepath="/SAVANT_REPOSITORY/org/hibernate/hibernate-entitymanager/3.3.2/hibernate-entitymanager-3.3.2-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/hsqldb/hsqldb/1.8.9/hsqldb-1.8.9.jar"
sourcepath="/SAVANT_REPOSITORY/org/hsqldb/hsqldb/1.8.9/hsqldb-1.8.9-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/jboss/javassist/3.4/javassist-3.4.jar"
sourcepath="/SAVANT_REPOSITORY/org/jboss/javassist/3.4/javassist-3.4-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/jcatapult/jcatapult-core/1.0/jcatapult-core-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/org/jcatapult/jcatapult-core/1.0/jcatapult-core-1.0-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/jcatapult/jcatapult-core/1.0/jcatapult-core-test-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/org/jcatapult/jcatapult-core/1.0/jcatapult-core-test-1.0-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/joda/joda-time/joda-time/1.4/joda-time-1.4.jar"
sourcepath="/SAVANT_REPOSITORY/org/joda/joda-time/joda-time/1.4/joda-time-1.4-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/joda/joda-time/joda-time-hibernate/1.0/joda-time-hibernate-1.0.jar"
sourcepath="/SAVANT_REPOSITORY/org/joda/joda-time/joda-time-hibernate/1.0/joda-time-hibernate-1.0-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/junit/junit/4.4/junit-4.4.jar"
sourcepath="/SAVANT_REPOSITORY/org/junit/junit/4.4/junit-4.4-src.jar"/>
+ <classpathentry kind="var"
path="SAVANT_REPOSITORY/org/objectweb/asm/asm/3.1/asm-3.1.jar"
sourcepath="/SAVANT_REPOSITORY/org/objectweb/asm/asm/3.1/asm-3.1-src.jar"/>
+ <classpathentry kind="output"
path="target/classes/production/jcatapult-persistence"/>
</classpath>
-
=======================================
--- /jcatapult-persistence/trunk/jcatapult-persistence.eml Thu Mar 19
09:34:02 2009
+++ /jcatapult-persistence/trunk/jcatapult-persistence.eml Mon Sep 28
10:50:47 2009
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<component inherit-compiler-output="true">
- <exclude-output />
- <testFolder url="file://$MODULE_DIR$/src/java/test/integration" />
- <testFolder url="file://$MODULE_DIR$/src/java/test/unit" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- <excludeFolder url="file://$MODULE_DIR$/web/WEB-INF/classes" />
- <excludeFolder url="file://$MODULE_DIR$/web/WEB-INF/lib" />
+ <exclude-output/>
+ <contentEntry url="file://$MODULE_DIR$">
+ <testFolder url="file://$MODULE_DIR$/src/java/test/integration"/>
+ <testFolder url="file://$MODULE_DIR$/src/java/test/unit"/>
+ <excludeFolder url="file://$MODULE_DIR$/target"/>
+ <excludeFolder url="file://$MODULE_DIR$/target/classes"/>
+ </contentEntry>
</component>
-
=======================================
--- /jcatapult-persistence/trunk/jcatapult-persistence.iml Thu Mar 19
09:34:02 2009
+++ /jcatapult-persistence/trunk/jcatapult-persistence.iml Mon Sep 28
10:50:47 2009
@@ -7,7 +7,7 @@
<setting name="provider-name" value="" />
<setting name="targe-facet" value="" />
<datasource-mapping />
- <deploymentDescriptor name="persistence.xml"
url="file://$MODULE_DIR$/src/conf/test/unit/META-INF/persistence.xml"
optional="false" version="1.0" />
+ <deploymentDescriptor name="persistence.xml"
url="file://$MODULE_DIR$/src/conf/test/unit/META-INF/persistence.xml" />
</configuration>
</facet>
</component>
=======================================
--- /jcatapult-persistence/trunk/jcatapult-persistence.ipr Mon May 11
18:49:06 2009
+++ /jcatapult-persistence/trunk/jcatapult-persistence.ipr Mon Sep 28
10:50:47 2009
@@ -75,69 +75,69 @@
<component name="IdProvider"
IDEtalkID="C3E10093AD37246DAE72198F2F6CDB7D" />
<component name="InspectionProjectProfileManager">
<option name="PROJECT_PROFILE" value="Project Default" />
- <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
- <scopes />
+ <option name="USE_PROJECT_PROFILE" value="true" />
+ <version value="1.0" />
<profiles>
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
- <inspection_tool class="InfiniteLoopStatement" level="WARNING"
enabled="false" />
- <inspection_tool class="TrivialIf" level="WARNING" enabled="false"
/>
- <inspection_tool class="EmptyFinallyBlock" level="WARNING"
enabled="false" />
- <inspection_tool class="EmptyStatementBody" level="WARNING"
enabled="false">
- <option name="m_reportEmptyBlocks" value="false" />
- </inspection_tool>
- <inspection_tool class="StringEquality" level="WARNING"
enabled="false" />
- <inspection_tool class="StringToString" level="WARNING"
enabled="false" />
- <inspection_tool class="LoopStatementsThatDontLoop"
level="WARNING" enabled="false" />
- <inspection_tool class="InfiniteRecursion" level="WARNING"
enabled="false" />
- <inspection_tool class="ConstantConditions" level="WARNING"
enabled="false">
+ <inspection_tool class="BooleanConstructor" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="CloneCallsSuperClone" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="CloneDeclaresCloneNotSupported"
enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="ConstantConditions" enabled="false"
level="WARNING" enabled_by_default="false">
<option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
<option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false"
/>
</inspection_tool>
- <inspection_tool class="EmptyCatchBlock" level="WARNING"
enabled="false">
+ <inspection_tool class="ContinueOrBreakFromFinallyBlock"
enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="EmptyCatchBlock" enabled="false"
level="WARNING" enabled_by_default="false">
<option name="m_includeComments" value="true" />
<option name="m_ignoreTestCases" value="true" />
<option name="m_ignoreIgnoreParameter" value="true" />
</inspection_tool>
- <inspection_tool
class="UnnecessaryTemporaryOnConversionFromString" level="WARNING"
enabled="false" />
- <inspection_tool class="UnusedAssignment" level="WARNING"
enabled="false">
- <option name="REPORT_PREFIX_EXPRESSIONS" value="false" />
- <option name="REPORT_POSTFIX_EXPRESSIONS" value="true" />
- <option name="REPORT_REDUNDANT_INITIALIZER" value="true" />
+ <inspection_tool class="EmptyFinallyBlock" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="EmptyStatementBody" enabled="false"
level="WARNING" enabled_by_default="false">
+ <option name="m_reportEmptyBlocks" value="false" />
</inspection_tool>
- <inspection_tool class="ForCanBeForeach" level="WARNING"
enabled="false">
- <option name="REPORT_INDEXED_LOOP" value="true" />
- </inspection_tool>
- <inspection_tool class="FinalizeCallsSuperFinalize"
level="WARNING" enabled="false">
+ <inspection_tool class="EmptyTryBlock" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="ExtendsObject" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="FinalPrivateMethod" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="FinalStaticMethod" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="FinalizeCallsSuperFinalize"
enabled="false" level="WARNING" enabled_by_default="false">
<option name="m_ignoreForObjectSubclasses" value="false" />
</inspection_tool>
- <inspection_tool class="UnnecessarySemicolon" level="WARNING"
enabled="false" />
- <inspection_tool class="PointlessArithmeticExpression"
level="WARNING" enabled="false">
+ <inspection_tool class="ForCanBeForeach" enabled="false"
level="WARNING" enabled_by_default="false">
+ <option name="REPORT_INDEXED_LOOP" value="true" />
+ </inspection_tool>
+ <inspection_tool class="InfiniteLoopStatement" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="InfiniteRecursion" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="LoopStatementsThatDontLoop"
enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="ManualArrayCopy" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="NoExplicitFinalizeCalls" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="PointlessArithmeticExpression"
enabled="false" level="WARNING" enabled_by_default="false">
<option name="m_ignoreExpressionsContainingConstants"
value="false" />
</inspection_tool>
- <inspection_tool class="UnnecessaryTemporaryOnConversionToString"
level="WARNING" enabled="false" />
- <inspection_tool class="UnusedLabel" level="WARNING"
enabled="false" />
- <inspection_tool class="BooleanConstructor" level="WARNING"
enabled="false" />
- <inspection_tool class="ExtendsObject" level="WARNING"
enabled="false" />
- <inspection_tool class="UnnecessaryBoxing" level="WARNING"
enabled="false" />
- <inspection_tool class="CloneCallsSuperClone" level="WARNING"
enabled="false" />
- <inspection_tool class="ReturnFromFinallyBlock" level="WARNING"
enabled="false" />
- <inspection_tool class="EmptyTryBlock" level="WARNING"
enabled="false" />
- <inspection_tool class="ManualArrayCopy" level="WARNING"
enabled="false" />
- <inspection_tool class="ThrowFromFinallyBlock" level="WARNING"
enabled="false" />
- <inspection_tool class="CloneDeclaresCloneNotSupported"
level="WARNING" enabled="false" />
- <inspection_tool class="RedundantCast" level="WARNING"
enabled="false" />
- <inspection_tool class="StringConstructor" level="WARNING"
enabled="false">
+ <inspection_tool class="RedundantCast" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="ReturnFromFinallyBlock" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="StringConstructor" enabled="false"
level="WARNING" enabled_by_default="false">
<option name="ignoreSubstringArguments" value="false" />
</inspection_tool>
- <inspection_tool class="UnnecessaryReturn" level="WARNING"
enabled="false" />
- <inspection_tool class="FinalStaticMethod" level="WARNING"
enabled="false" />
- <inspection_tool class="UnnecessaryUnboxing" level="WARNING"
enabled="false" />
- <inspection_tool class="NoExplicitFinalizeCalls" level="WARNING"
enabled="false" />
- <inspection_tool class="FinalPrivateMethod" level="WARNING"
enabled="false" />
- <inspection_tool class="ContinueOrBreakFromFinallyBlock"
level="WARNING" enabled="false" />
- <inspection_tool class="SynchronizeOnNonFinalField"
level="WARNING" enabled="false" />
+ <inspection_tool class="StringEquality" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="StringToString" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="SynchronizeOnNonFinalField"
enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="ThrowFromFinallyBlock" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="TrivialIf" enabled="false" level="WARNING"
enabled_by_default="false" />
+ <inspection_tool class="UnnecessaryBoxing" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="UnnecessaryReturn" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="UnnecessarySemicolon" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool
class="UnnecessaryTemporaryOnConversionFromString" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="UnnecessaryTemporaryOnConversionToString"
enabled="false" level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="UnnecessaryUnboxing" enabled="false"
level="WARNING" enabled_by_default="false" />
+ <inspection_tool class="UnusedAssignment" enabled="false"
level="WARNING" enabled_by_default="false">
+ <option name="REPORT_PREFIX_EXPRESSIONS" value="false" />
+ <option name="REPORT_POSTFIX_EXPRESSIONS" value="true" />
+ <option name="REPORT_REDUNDANT_INITIALIZER" value="true" />
+ </inspection_tool>
+ <inspection_tool class="UnusedLabel" enabled="false"
level="WARNING" enabled_by_default="false" />
</profile>
</profiles>
<list size="0" />
@@ -304,7 +304,9 @@
<component name="ProjectDetails">
<option name="projectName" value="jcatapult-persistence" />
</component>
- <component name="ProjectFileVersion" converted="true" />
+ <component name="ProjectDictionaryState">
+ <dictionary name="bpontarelli" />
+ </component>
<component name="ProjectKey">
<option name="state"
value="https://jcatapult.googlecode.com/svn/jcatapult-persistence/trunk/jcatapult-persistence.ipr"
/>
</component>
=======================================
--- /jcatapult-persistence/trunk/project.xml Tue Jun 16 13:50:04 2009
+++ /jcatapult-persistence/trunk/project.xml Mon Sep 28 10:50:47 2009
@@ -1,7 +1,7 @@
<project xmlns="http://www.inversoft.org/schemas/savant-2.0/project"
name="jcatapult-persistence"
group="jcatapult.org"
- version="1.0.2">
+ version="1.0.3">

<plugin group="plugins.savant.inversoft.org" name="ide" version="1.0"/>
<plugin group="plugins.savant.inversoft.org" name="clean" version="1.0"/>
@@ -26,6 +26,7 @@
<dependencies>
<artifact-group type="compile-only">
<artifact group="servlet.javax" name="servlet-api" version="2.4"/>
+ <artifact group="mysql.com" name="mysql-connector-java"
version="5.1.6"/>
</artifact-group>
<artifact-group type="compile">
<artifact group="aopalliance.sourceforge.net" name="aopalliance"
version="1.0"/>
@@ -35,7 +36,6 @@
<artifact group="jcatapult.org" name="jcatapult-core"
version="${version.jcatapult}"/>
<artifact group="java-net-commons.dev.java.net"
name="java-net-commons" version="1.5"/>
<artifact group="joda-time.joda.org" name="joda-time" version="1.4"/>
- <artifact group="mysql.com" name="mysql-connector-java"
version="5.1.6"/>
<artifact group="persistence.javax" name="persistence-api"
version="1.0"/>
</artifact-group>
<artifact-group type="run">
=======================================
---
/jcatapult-persistence/trunk/src/java/test/unit/org/jcatapult/servlet/JCatapultFilterTest.java
Thu Mar 19 09:34:02 2009
+++
/jcatapult-persistence/trunk/src/java/test/unit/org/jcatapult/servlet/JCatapultFilterTest.java
Mon Sep 28 10:50:47 2009
@@ -27,6 +27,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

+import net.java.naming.MockJNDI;
import static org.easymock.EasyMock.*;
import org.jcatapult.environment.Environment;
import org.jcatapult.persistence.DatabaseTools;
@@ -34,8 +35,6 @@
import static org.junit.Assert.*;
import org.junit.Test;

-import net.java.naming.MockJNDI;
-
/**
* <p>
* This class is the test case for the JCatapultFilter.
@@ -47,7 +46,7 @@
@Test
public void testJPA() throws ServletException, IOException {
MockJNDI jndi = new MockJNDI();
- DatabaseTools.setupJDBCandJNDI(jndi, "jcatapult_core_test");
+ DatabaseTools.setupJDBCandJNDI(jndi, "jcatapult_persistence_test");
jndi.bind("java:comp/env/environment", new
Environment("unittesting"));
jndi.activate();

Reply all

Reply to author

Forward

0 new messages