Permalink
Browse files

fix merge conflict

  • Loading branch information...
mindcrime committed Aug 4, 2012
1 parent b60e0fa commit 30fb6b355faf77cd7cd596fb1dceb141f9371480
Showing with 41 additions and 47 deletions.
  1. +34 −39 .classpath
  2. +4 −5 .settings/org.eclipse.wst.common.component
  3. +3 −3 application.properties
View
@@ -72,7 +72,6 @@
<classpathentry kind="src" path="grails-app/listeners"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
- <classpathentry kind="con" path="com.springsource.sts.grails.core.CLASSPATH_CONTAINER"/>
<classpathentry kind="lib" path="/usr/java/junit3.8.1/junit.jar"/>
<classpathentry kind="lib" path="lib/arq-2.8.7.jar"/>
<classpathentry kind="lib" path="lib/concurrent.jar"/>
@@ -132,67 +131,75 @@
<classpathentry kind="lib" path="lib/jackson-all-1.9.3.jar"/>
<classpathentry kind="lib" path="lib/ical4j-1.0.3.jar"/>
<classpathentry kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
- <classpathentry kind="src" path=".link_to_grails_plugins/navigation-1.1.1/grails-app/taglib">
- <attributes>
- <attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/navigation-1.1.1/grails-app/services">
+ <classpathentry kind="lib" path="lib/exist-fluent.jar"/>
+ <classpathentry kind="lib" path="lib/exist-optional.jar"/>
+ <classpathentry kind="lib" path="lib/exist.jar"/>
+ <classpathentry kind="lib" path="lib/excalibur-cli-1.0.jar"/>
+ <classpathentry kind="lib" path="lib/jgroups-all-2.2.6.jar"/>
+ <classpathentry kind="lib" path="lib/jline-0.9.94.jar"/>
+ <classpathentry kind="lib" path="lib/xmldb.jar"/>
+ <classpathentry kind="lib" path="lib/xmlrpc-client-3.1.2.jar"/>
+ <classpathentry kind="lib" path="lib/xmlrpc-common-3.1.2.jar"/>
+ <classpathentry kind="lib" path="lib/xmlrpc-server-3.1.2.jar"/>
+ <classpathentry kind="lib" path="lib/serializer.jar"/>
+ <classpathentry kind="lib" path="lib/xalan.jar"/>
+ <classpathentry kind="lib" path="lib/ws-commons-util-1.0.2.jar"/>
+ <classpathentry kind="src" path=".link_to_grails_plugins/code-coverage-1.2/grails-app/i18n">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/navigation-1.1.1/grails-app/i18n">
+ <classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/jaxrs-0.5-m1/grails-app/conf">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/jms-1.2/grails-app/utils">
+ <classpathentry kind="src" path=".link_to_grails_plugins/jaxrs-0.5-m1/grails-app/controllers">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/jms-1.2/grails-app/services">
+ <classpathentry kind="src" path=".link_to_grails_plugins/jaxrs-0.5-m1/src/groovy">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/jms-1.2/src/java">
+ <classpathentry kind="src" path=".link_to_grails_plugins/jaxrs-0.5-m1/src/java">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/jms-1.2/src/groovy">
+ <classpathentry kind="src" path=".link_to_grails_plugins/jms-1.2/grails-app/services">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/quartz-1.0-SNAPSHOT/grails-app/services">
+ <classpathentry kind="src" path=".link_to_grails_plugins/jms-1.2/grails-app/utils">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/quartz-1.0-SNAPSHOT/grails-app/conf">
+ <classpathentry kind="src" path=".link_to_grails_plugins/jms-1.2/src/groovy">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/quartz-1.0-SNAPSHOT/grails-app/i18n">
+ <classpathentry kind="src" path=".link_to_grails_plugins/jms-1.2/src/java">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/quartz-1.0-SNAPSHOT/src/java">
+ <classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/jquery-1.4.4.1/grails-app/conf">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/quartz-1.0-SNAPSHOT/src/groovy">
+ <classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.4.4.1/grails-app/i18n">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/code-coverage-1.2/grails-app/i18n">
+ <classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.4.4.1/grails-app/services">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
@@ -202,42 +209,42 @@
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.4.4.1/grails-app/services">
+ <classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.4.4.1/src/groovy">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/jquery-1.4.4.1/grails-app/conf">
+ <classpathentry kind="src" path=".link_to_grails_plugins/navigation-1.1.1/grails-app/i18n">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.4.4.1/grails-app/i18n">
+ <classpathentry kind="src" path=".link_to_grails_plugins/navigation-1.1.1/grails-app/services">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/jquery-1.4.4.1/src/groovy">
+ <classpathentry kind="src" path=".link_to_grails_plugins/navigation-1.1.1/grails-app/taglib">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/jaxrs-0.5-m1/grails-app/controllers">
+ <classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/quartz-1.0-RC1/grails-app/conf">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry excluding="BuildConfig.groovy|*DataSource.groovy|UrlMappings.groovy|Config.groovy|BootStrap.groovy|spring/resources.groovy" kind="src" path=".link_to_grails_plugins/jaxrs-0.5-m1/grails-app/conf">
+ <classpathentry kind="src" path=".link_to_grails_plugins/quartz-1.0-RC1/grails-app/services">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/jaxrs-0.5-m1/src/java">
+ <classpathentry kind="src" path=".link_to_grails_plugins/quartz-1.0-RC1/src/groovy">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="src" path=".link_to_grails_plugins/jaxrs-0.5-m1/src/groovy">
+ <classpathentry kind="src" path=".link_to_grails_plugins/quartz-1.0-RC1/src/java">
<attributes>
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
@@ -247,18 +254,6 @@
<attribute name="com.springsource.sts.grails.core.SOURCE_FOLDER" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="lib/exist-fluent.jar"/>
- <classpathentry kind="lib" path="lib/exist-optional.jar"/>
- <classpathentry kind="lib" path="lib/exist.jar"/>
- <classpathentry kind="lib" path="lib/excalibur-cli-1.0.jar"/>
- <classpathentry kind="lib" path="lib/jgroups-all-2.2.6.jar"/>
- <classpathentry kind="lib" path="lib/jline-0.9.94.jar"/>
- <classpathentry kind="lib" path="lib/xmldb.jar"/>
- <classpathentry kind="lib" path="lib/xmlrpc-client-3.1.2.jar"/>
- <classpathentry kind="lib" path="lib/xmlrpc-common-3.1.2.jar"/>
- <classpathentry kind="lib" path="lib/xmlrpc-server-3.1.2.jar"/>
- <classpathentry kind="lib" path="lib/serializer.jar"/>
- <classpathentry kind="lib" path="lib/xalan.jar"/>
- <classpathentry kind="lib" path="lib/ws-commons-util-1.0.2.jar"/>
+ <classpathentry kind="con" path="com.springsource.sts.grails.core.CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
@@ -11,17 +11,16 @@
<wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/jms-1.2/src/groovy"/>
<wb-resource deploy-path="/" source-path="/src/groovy"/>
<wb-resource deploy-path="/" source-path="/grails-app/jobs"/>
- <wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/quartz-1.0-SNAPSHOT/grails-app/services"/>
- <wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/quartz-1.0-SNAPSHOT/grails-app/conf"/>
- <wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/quartz-1.0-SNAPSHOT/grails-app/i18n"/>
- <wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/quartz-1.0-SNAPSHOT/src/java"/>
- <wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/quartz-1.0-SNAPSHOT/src/groovy"/>
<wb-resource deploy-path="/" source-path="/src/java"/>
<wb-resource deploy-path="/" source-path="/grails-app/resources"/>
<wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/jaxrs-0.5-m1/grails-app/controllers"/>
<wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/jaxrs-0.5-m1/grails-app/conf"/>
<wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/jaxrs-0.5-m1/src/java"/>
<wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/jaxrs-0.5-m1/src/groovy"/>
<wb-resource deploy-path="/" source-path="/grails-app/taglib"/>
+ <wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/quartz-1.0-RC1/grails-app/conf"/>
+ <wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/quartz-1.0-RC1/grails-app/services"/>
+ <wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/quartz-1.0-RC1/src/groovy"/>
+ <wb-resource deploy-path="/" source-path="/.link_to_grails_plugins/quartz-1.0-RC1/src/java"/>
</wb-module>
</project-modules>
View
@@ -1,7 +1,7 @@
#Grails Metadata file
-#Tue Apr 03 21:22:12 CDT 2012
+#Sat Jul 07 18:17:08 CDT 2012
app.context=/quoddy
-app.grails.version=1.3.7
+app.grails.version=1.3.7.BUILD-SNAPSHOT
app.name=quoddy2
app.servlet.version=2.5
app.version=0.1
@@ -12,5 +12,5 @@ plugins.jms=1.2
plugins.jquery=1.4.4.1
plugins.navigation=1.1.1
plugins.quartz=1.0-RC1
-plugins.tomcat=1.3.7
+plugins.tomcat=1.3.7.BUILD-SNAPSHOT
plugins.webflow=1.3.7

0 comments on commit 30fb6b3

Please sign in to comment.