version 0.9.6

branaway · Mar 11, 2016 · 110f390 · 110f390
1 parent a2e99dd
commit 110f390
Show file tree

Hide file tree

Showing 392 changed files with 2,179 additions and 617 deletions.
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -1,14 +1,5 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -17,7 +8,6 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -71,4 +61,3 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/JapidContact/.classpath b/JapidContact/.classpath
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="views/**" kind="src" path="app"/>
+	<classpathentry excluding="japidviews/**|rythm/**|views/**" kind="src" path="app"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="src" path="docviewer"/>
 
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/play-1.2.6-jdk8-1.4.1-2-ga81da9d.jar" sourcepath="/Users/bran/projects/play-git/framework/src" />
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/play-1.4.x-original-1.4.x-merged.jar" sourcepath="/Users/bran/projects/play-git/framework/src" />
 	<classpathentry kind="lib" path="/Users/bran/projects/japid/JapidContact/lib/classmate-0.8.0.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/japid/JapidContact/lib/hibernate-jpa-2.1-api-1.0.0.Draft-16.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/japid/JapidContact/lib/hibernate-validator-5.0.1.Final.jar"/>
@@ -17,85 +17,84 @@
 	<classpathentry kind="lib" path="/Users/bran/projects/japid/JapidContact/lib/validation-api-1.1.0.Final.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/activation-1.1.1.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/antlr-2.7.7.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/asm-5.0.1.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/asm-analysis-5.0.1.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/asm-commons-5.0.1.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/asm-tree-5.0.1.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/asm-util-5.0.1.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/asm-xml-5.0.1.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/async-http-client-1.7.8.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/asm-all-5.0.4.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/async-http-client-1.9.31.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/bcprov-jdk15-1.45.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/bytecodeparser-0.3.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/c3p0-0.9.1.2.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/c3p0-0.9.5.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/c3p0-oracle-thin-extras-0.9.5.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/cglib-3.1.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/cglib-nodep-3.1.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/classmate-1.0.0.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-beanutils-1.8.3.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-codec-1.8.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-codec-1.10.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-email-1.3.1.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-fileupload-1.3.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-email-1.3.3.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-fileupload-1.3.1.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-httpclient.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-io-2.4.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-javaflow-1209105.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-javaflow-1590792.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-lang-2.6.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-logging-1.1.3.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/commons-logging-1.2.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/ehcache-core-2.4.3.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/ezmorph-1.0.3.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/ehcache-core-2.6.11.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/ezmorph-1.0.6.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/geronimo-servlet_2.5_spec-1.2.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/groovy-all-1.8.6.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/gson-2.2.4.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/h2-1.3.173.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/groovy-all-2.4.6.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/gson-2.3.1.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/h2-1.4.185.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-core-4.1.3.Final.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-ehcache-4.1.3.Final.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-entitymanager-4.1.3.Final.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-c3p0-4.2.19.Final.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-commons-annotations-4.0.2.Final.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-core-4.2.19.Final.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-ehcache-4.2.19.Final.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-entitymanager-4.2.19.Final.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-jpamodelgen-1.3.0.Final.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-spatial-1.1-trunk.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-spatial-postgis-1.1-trunk.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-validator-4.3.1.Final.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/hibernate-validator-annotation-processor-4.3.1.Final.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/ivy-2.3.0.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/ivy-2.4.0.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jackson-all-1.7.5.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jamon-2.7.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jamon-2.81.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jandex-1.1.0.Final.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/javassist-3.18.1-GA.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/javassist-2016-3-1.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/javax.el-2.2.4.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/javax.el-api-2.2.4.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/javax.inject-1.0.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jaxen-1.1.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jaxen-1.1.6.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jboss-logging-3.1.3.GA.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jboss-logging-annotations-1.2.0.Beta1.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jboss-transaction-api_1.2_spec-1.0.0.Final.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jj-imaging.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jj-simplecaptcha.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jj-textile.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jj-wikitext.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/joda-time-2.3.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/joda-time-2.8.2.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jregex-1.2_01.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/jsr107cache-1.0.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/junit-4.11.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/junit-4.12.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/log4j-1.2.17.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/mail-1.4.7.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/memcached-2.6.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/mysql-connector-java-5.1.20.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/netty-3.6.6.Final.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/org.eclipse.jdt.core-3.9.50.v20140317-1741.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/oval-1.82.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/mchange-commons-java-0.2.9.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/mysql-connector-java-5.1.35.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/netty-3.10.4.Final.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/org.eclipse.jdt.core-3.10.0.v20140604-1726.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/oval-1.84.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/PlayAgent.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/postgresql-9.0.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/signpost-core-1.2.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/slf4j-api-1.7.5.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/slf4j-log4j12-1.7.5.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/snakeyaml-1.12.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/slf4j-api-1.7.10.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/slf4j-log4j12-1.7.10.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/snakeyaml-1.15.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/spring-beans.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/spring-context.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/spring-core.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/spymemcached-2.11.7.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/validation-api-1.0.0.GA.jar"/>
 	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/xmlpull-1.1.3.1.jar"/>
-	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/xstream-1.4.2.jar"/>
+	<classpathentry kind="lib" path="/Users/bran/projects/play-git/framework/lib/xstream-1.4.7.jar"/>
 
 	<classpathentry kind="output" path="eclipse/classes"/>
 </classpath>
diff --git a/JapidContact/eclipse/.classpath b/JapidContact/eclipse/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="views/**" kind="src" path="app"/>
+	<classpathentry excluding="japidviews/**|rythm/**|views/**" kind="src" path="app"/>
 	%TESTCLASSPATH%
 	%MODULES%
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

diff --git a/...lipse/Connect JPDA to JapidContact.launch → ...ntact/eclipse/Connect JPDA to Play.launch b/...lipse/Connect JPDA to JapidContact.launch → ...ntact/eclipse/Connect JPDA to Play.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JapidContact2"/>
+<listEntry value="/play-git"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
@@ -11,6 +11,6 @@
 <mapEntry key="hostname" value="localhost"/>
 <mapEntry key="port" value="8000"/>
 </mapAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JapidContact2"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="play-git"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/>
 </launchConfiguration>