Skip to content

Commit 6c2f21f

Browse files
jeden25jeden25
committed
This project now uses Maven to manage jar dependencies.
1 parent 02b2307 commit 6c2f21f

22 files changed

+90
-21
lines changed

‎ElephantSQL-Uploader.war

-1.5 MB
Binary file not shown.

‎app/.classpath

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5-
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/json-simple-1.1.jar"/>
6-
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.3.jar"/>
7-
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/commons-io-2.4.jar"/>
8-
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/postgresql-9.1-901.jdbc4.jar"/>
9-
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
10-
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
11-
<classpathentry kind="lib" path="WebContent/WEB-INF/lib/servlet-api-2.5.jar"/>
12-
<classpathentry kind="output" path="bin"/>
3+
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
10+
<attributes>
11+
<attribute name="maven.pomderived" value="true"/>
12+
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="output" path="target/classes"/>
1316
</classpath>

‎app/.project

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.wst.common.project.facet.core.builder</name>
14+
<name>org.eclipse.jdt.core.javabuilder</name>
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
1818
<buildCommand>
19-
<name>org.eclipse.jdt.core.javabuilder</name>
19+
<name>org.eclipse.wst.common.project.facet.core.builder</name>
2020
<arguments>
2121
</arguments>
2222
</buildCommand>
@@ -25,12 +25,18 @@
2525
<arguments>
2626
</arguments>
2727
</buildCommand>
28+
<buildCommand>
29+
<name>org.eclipse.m2e.core.maven2Builder</name>
30+
<arguments>
31+
</arguments>
32+
</buildCommand>
2833
</buildSpec>
2934
<natures>
35+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
3036
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
3137
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
32-
<nature>org.eclipse.jdt.core.javanature</nature>
3338
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
39+
<nature>org.eclipse.jdt.core.javanature</nature>
3440
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
3541
</natures>
3642
</projectDescription>

‎app/.settings/.jsdtscope

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry excluding="js/" kind="src" path="WebContent"/>
3+
<classpathentry kind="src" path="WebContent"/>
44
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
55
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
66
<attributes>

‎app/.settings/org.eclipse.jdt.core.prefs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
4-
org.eclipse.jdt.core.compiler.compliance=1.5
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.compliance=1.7
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.5
7+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
8+
org.eclipse.jdt.core.compiler.source=1.7

‎app/.settings/org.eclipse.m2e.core.prefs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎app/.settings/org.eclipse.wst.common.component

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
2-
<wb-module deploy-name="TwitterSearch0">
2+
<wb-module deploy-name="PostgreSQLUpload">
3+
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
34
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
45
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
5-
<property name="java-output-path" value="/TwitterSearch0/bin"/>
6-
<property name="context-root" value="elephantsql"/>
6+
<property name="context-root" value="PostgreSQLUpload"/>
7+
<property name="java-output-path" value="/PostgreSQLUpload/build/classes"/>
78
</wb-module>
89
</project-modules>

‎app/.settings/org.eclipse.wst.common.project.facet.core.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<faceted-project>
3+
<runtime name="IBM Bluemix Runtime"/>
34
<fixed facet="wst.jsdt.web"/>
4-
<installed facet="java" version="1.5"/>
5+
<fixed facet="jst.web"/>
6+
<fixed facet="java"/>
7+
<installed facet="java" version="1.7"/>
58
<installed facet="jst.web" version="2.5"/>
69
<installed facet="wst.jsdt.web" version="1.0"/>
710
</faceted-project>

‎app/.settings/org.eclipse.wst.validation.prefs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
disabled=06target
2+
eclipse.preferences.version=1

‎app/WebContent/WEB-INF/lib/commons-codec-1.6.jar

-227 KB
Binary file not shown.

0 commit comments

Comments
 (0)