Skip to content

Commit

Permalink
Merge branch 'master' of github.com:DDB-/agilefant
Browse files Browse the repository at this point in the history 
Conflicts:
	web/static/js/dynamics/controller/StoryController.js
	web/static/js/dynamics/controller/StoryListController.js
  • Loading branch information
@DDB-
DDB- committed Feb 26, 2012
2 parents cfe5a01 + deba076 commit 5250b7c
Show file tree
Hide file tree
Showing 118 changed files with 4,717 additions and 980 deletions.
9 changes: 9 additions & 0 deletions .buildpath
View file
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<buildpath>
<buildpathentry kind="src" path="src"/>
<buildpathentry kind="src" path="test"/>
<buildpathentry kind="con" path="org.eclipse.dltk.mod.launching.INTERPRETER_CONTAINER"/>
<buildpathentry kind="con" path="org.ebayopensource.vjet.eclipse.core.SDK_CONTAINER/DEFUALT_SDK"/>
<buildpathentry kind="lib" path="lib/commons-validator-1.3.1.jar"/>
<buildpathentry kind="lib" path="lib/struts2-core-2.1.6.jar"/>
</buildpath>
198 changes: 99 additions & 99 deletions .classpath
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,99 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/> <classpathentry kind="src" path="test"/>
<classpathentry exported="true" kind="lib" path="conf/test"/> <classpathentry exported="true" kind="lib" path="conf/test"/>
<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/> <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
<classpathentry kind="lib" path="lib/commons-validator-1.3.1.jar"/> <classpathentry kind="lib" path="lib/commons-validator-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/> <classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
<classpathentry kind="lib" path="lib/commons-io-1.3.2.jar"/> <classpathentry kind="lib" path="lib/commons-io-1.3.2.jar"/>
<classpathentry kind="lib" path="lib/freemarker-2.3.13.jar"/> <classpathentry kind="lib" path="lib/freemarker-2.3.13.jar"/>
<classpathentry kind="lib" path="lib/ognl-2.6.11.jar"/> <classpathentry kind="lib" path="lib/ognl-2.6.11.jar"/>
<classpathentry kind="lib" path="lib/struts2-core-2.1.6.jar"/> <classpathentry kind="lib" path="lib/struts2-core-2.1.6.jar"/>
<classpathentry kind="lib" path="lib/xwork-2.1.2.jar"/> <classpathentry kind="lib" path="lib/xwork-2.1.2.jar"/>
<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/> <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="lib/struts2-spring-plugin-2.1.6.jar"/> <classpathentry kind="lib" path="lib/struts2-spring-plugin-2.1.6.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.3.jar"/> <classpathentry kind="lib" path="lib/commons-lang-2.3.jar"/>
<classpathentry kind="lib" path="lib/build/struts2-junit-plugin-2.1.6.jar"/> <classpathentry kind="lib" path="lib/build/struts2-junit-plugin-2.1.6.jar"/>
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/> <classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/>
<classpathentry kind="lib" path="lib/struts2jsonresult.jar"/> <classpathentry kind="lib" path="lib/struts2jsonresult.jar"/>
<classpathentry kind="lib" path="lib/build/jsdoctoolkit-ant-task-1.0.jar"/> <classpathentry kind="lib" path="lib/build/jsdoctoolkit-ant-task-1.0.jar"/>
<classpathentry kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.0.Final.jar"/> <classpathentry kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.0.Final.jar"/>
<classpathentry kind="lib" path="lib/cglib-2.2.jar"/> <classpathentry kind="lib" path="lib/cglib-2.2.jar"/>
<classpathentry kind="lib" path="lib/poi-3.6.jar"/> <classpathentry kind="lib" path="lib/poi-3.6.jar"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="lib/commons-logging.jar"> <classpathentry exported="true" kind="lib" path="lib/commons-logging.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="http://jakarta.apache.org/commons/logging/apidocs/"/> <attribute name="javadoc_location" value="http://jakarta.apache.org/commons/logging/apidocs/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry exported="true" kind="lib" path="lib/javamail.jar"/> <classpathentry exported="true" kind="lib" path="lib/javamail.jar"/>
<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar"> <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="http://logging.apache.org/log4j/docs/api/"/> <attribute name="javadoc_location" value="http://logging.apache.org/log4j/docs/api/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry exported="true" kind="lib" path="lib/oscore.jar"/> <classpathentry exported="true" kind="lib" path="lib/oscore.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hibernate3.jar"> <classpathentry exported="true" kind="lib" path="lib/hibernate3.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="http://www.hibernate.org/hib_docs/v3/api/"/> <attribute name="javadoc_location" value="http://www.hibernate.org/hib_docs/v3/api/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry exported="true" kind="lib" path="lib/jstl.jar"/> <classpathentry exported="true" kind="lib" path="lib/jstl.jar"/>
<classpathentry exported="true" kind="lib" path="lib/standard.jar"/> <classpathentry exported="true" kind="lib" path="lib/standard.jar"/>
<classpathentry exported="true" kind="lib" path="lib/build/jsp-api.jar"/> <classpathentry exported="true" kind="lib" path="lib/build/jsp-api.jar"/>
<classpathentry exported="true" kind="lib" path="lib/build/servlet-api.jar"/> <classpathentry exported="true" kind="lib" path="lib/build/servlet-api.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/spring.jar"> <classpathentry exported="true" kind="lib" path="lib/spring.jar">
<attributes> <attributes>
<attribute name="javadoc_location" value="http://www.springframework.org/docs/api/"/> <attribute name="javadoc_location" value="http://www.springframework.org/docs/api/"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/> <classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-beanutils.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-beanutils.jar"/>
<classpathentry exported="true" kind="lib" path="lib/postgresql-8.1-407.jdbc3.jar"/> <classpathentry exported="true" kind="lib" path="lib/postgresql-8.1-407.jdbc3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.0_03.jar"/> <classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.0_03.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.3.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.6.jar"/> <classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/oro-2.0.8.jar"/> <classpathentry exported="true" kind="lib" path="lib/oro-2.0.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/build/jdepend-2.9.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/build/jdepend-2.9.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mail.jar"/> <classpathentry exported="true" kind="lib" path="lib/mail.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-email-1.0.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-email-1.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/activation.jar"/> <classpathentry exported="true" kind="lib" path="lib/activation.jar"/>
<classpathentry exported="true" kind="lib" path="lib/stringtemplate.jar"/> <classpathentry exported="true" kind="lib" path="lib/stringtemplate.jar"/>
<classpathentry exported="true" kind="lib" path="lib/serializer.jar"/> <classpathentry exported="true" kind="lib" path="lib/serializer.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xalan.jar"/> <classpathentry exported="true" kind="lib" path="lib/xalan.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/> <classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/> <classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
<classpathentry exported="true" kind="lib" path="lib/spring-security-core-2.0.3.jar"/> <classpathentry exported="true" kind="lib" path="lib/spring-security-core-2.0.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/spring-security-core-tiger-2.0.3.jar"/> <classpathentry exported="true" kind="lib" path="lib/spring-security-core-tiger-2.0.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/flexjson.jar"/> <classpathentry exported="true" kind="lib" path="lib/flexjson.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.7-bin.jar"/> <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.7-bin.jar"/>
<classpathentry kind="lib" path="lib/joda-time-1.6.jar" sourcepath="lib-src/joda-time-1.6-sources.jar"/> <classpathentry kind="lib" path="lib/joda-time-1.6.jar" sourcepath="lib-src/joda-time-1.6-sources.jar"/>
<classpathentry kind="lib" path="lib/joda-time-hibernate-1.1.jar"/> <classpathentry kind="lib" path="lib/joda-time-hibernate-1.1.jar"/>
<classpathentry kind="lib" path="lib/joda-time-jsptags-1.0.2.jar"/> <classpathentry kind="lib" path="lib/joda-time-jsptags-1.0.2.jar"/>
<classpathentry kind="lib" path="lib/spring-test.jar"/> <classpathentry kind="lib" path="lib/spring-test.jar" sourcepath="/home/david/.m2/repository/org/springframework/spring-test/2.5.6.SEC01/spring-test-2.5.6.SEC01-sources.jar"/>
<classpathentry kind="lib" path="lib/build/h2-1.1.114.jar"/> <classpathentry kind="lib" path="lib/build/h2-1.1.114.jar"/>
<classpathentry kind="lib" path="lib/build/easymock-2.5.jar"/> <classpathentry kind="lib" path="lib/build/easymock-2.5.jar"/>
<classpathentry kind="lib" path="lib/build/easymockclassextension-2.4.jar"/> <classpathentry kind="lib" path="lib/build/easymockclassextension-2.4.jar"/>
<classpathentry kind="lib" path="lib/build/YUIAnt.jar"/> <classpathentry kind="lib" path="lib/build/YUIAnt.jar"/>
<classpathentry kind="lib" path="lib/build/yuicompressor-2.4.2.jar"/> <classpathentry kind="lib" path="lib/build/yuicompressor-2.4.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.13.jar"/> <classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.13.jar"/>
<classpathentry kind="lib" path="lib/aspectjrt.jar"/> <classpathentry kind="lib" path="lib/aspectjrt.jar"/>
<classpathentry kind="lib" path="lib/aspectjweaver.jar"/> <classpathentry kind="lib" path="lib/aspectjweaver.jar"/>
<classpathentry kind="lib" path="lib/common-annotations.jar"/> <classpathentry kind="lib" path="lib/common-annotations.jar"/>
<classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/> <classpathentry kind="lib" path="lib/commons-collections-3.1.jar"/>
<classpathentry kind="lib" path="lib/javassist-3.9.0.GA.jar"/> <classpathentry kind="lib" path="lib/javassist-3.9.0.GA.jar"/>
<classpathentry kind="lib" path="lib/jta-1.1.jar"/> <classpathentry kind="lib" path="lib/jta-1.1.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.5.8.jar"/> <classpathentry kind="lib" path="lib/slf4j-api-1.5.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/build/junit-4.4.jar"/> <classpathentry exported="true" kind="lib" path="lib/build/junit-4.4.jar"/>
<classpathentry kind="lib" path="lib/gzipflt.jar"/> <classpathentry kind="lib" path="lib/gzipflt.jar"/>
<classpathentry kind="lib" path="lib/hibernate-validator.jar"/> <classpathentry kind="lib" path="lib/hibernate-validator.jar"/>
<classpathentry kind="lib" path="lib/jsr311-api-1.1.1.jar"/> <classpathentry kind="lib" path="lib/jsr311-api-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/asm-3.1.jar"/> <classpathentry kind="lib" path="lib/asm-3.1.jar"/>
<classpathentry kind="lib" path="lib/jersey-core-1.3.jar"/> <classpathentry kind="lib" path="lib/jersey-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/jersey-server-1.3.jar"/> <classpathentry kind="lib" path="lib/jersey-server-1.3.jar"/>
<classpathentry kind="lib" path="lib/jersey-spring-1.3.jar"/> <classpathentry kind="lib" path="lib/jersey-spring-1.3.jar"/>
<classpathentry kind="output" path="eclipse-classes"/> <classpathentry kind="output" path="eclipse-classes"/>
</classpath> </classpath>
3 changes: 3 additions & 0 deletions .settings/org.ebayopensource.vjet.eclipse.core.prefs
View file
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,3 @@
#Wed Feb 01 17:35:33 PST 2012
eclipse.preferences.version=1
initialized_project_from_v4classpath=true
15 changes: 10 additions & 5 deletions .settings/org.eclipse.jdt.core.prefs
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,18 +1,18 @@
#Tue Nov 13 21:16:27 EET 2007 #Mon Jan 16 16:53:40 PST 2012
*=(?)Code placement information (within a file), used by Eclipse, for developing purposes. *=(?)Code placement information (within a file), used by Eclipse, for developing purposes.
**= **=
*/= */=
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
Expand Down Expand Up @@ -86,7 +86,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=8 org.eclipse.jdt.core.formatter.indentation.size=8
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
Expand Down
21 changes: 11 additions & 10 deletions .settings/org.eclipse.wst.common.component
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0"> <project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="agilefant"> <wb-module deploy-name="agilefant">
<wb-resource deploy-path="/" source-path="/web"/> <wb-resource deploy-path="/" source-path="/web"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/> <wb-resource deploy-path="/WEB-INF/" source-path="/conf"/>
<property name="context-root" value="agilefant"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/>
<property name="java-output-path" value="build/classes"/> <property name="context-root" value="agilefant"/>
</wb-module> <property name="java-output-path" value="build/classes"/>
</project-modules> </wb-module>
</project-modules>
3 changes: 3 additions & 0 deletions .settings/org.eclipse.wst.ws.service.policy.prefs
View file
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,3 @@
#Sun Jan 15 01:49:57 PST 2012
eclipse.preferences.version=1
org.eclipse.wst.ws.service.policy.projectEnabled=false
Loading

0 comments on commit 5250b7c

Please sign in to comment.