From 13d7ef6c133329c8a70ad123ac445ed3b45d756f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 24 Jul 2012 17:43:51 -0400 Subject: Improve Maven to make jar, included README_MAVEN and removed unecessary files --- README_MAVEN.txt | 42 ++ build.xml | 74 --- nbproject/build-impl.xml | 1053 ----------------------------------------- nbproject/genfiles.properties | 8 - nbproject/project.properties | 101 ---- nbproject/project.xml | 15 - pom.xml | 22 +- 7 files changed, 58 insertions(+), 1257 deletions(-) create mode 100644 README_MAVEN.txt delete mode 100644 build.xml delete mode 100644 nbproject/build-impl.xml delete mode 100644 nbproject/genfiles.properties delete mode 100644 nbproject/project.properties delete mode 100644 nbproject/project.xml diff --git a/README_MAVEN.txt b/README_MAVEN.txt new file mode 100644 index 000000000..c12762bf0 --- /dev/null +++ b/README_MAVEN.txt @@ -0,0 +1,42 @@ +----------------ECLIPSE------------------------- +If you use Eclipse for Jave EE, you can simply import the generated +project into Eclipse. We've tested against Eclipse 3.6. Later versions +will likely also work, earlier versions may not. + +Eclipse users will need to install the following plugin components: +- Google Plugin for Eclipse (instructions at http://code.google.com/eclipse/) +- m2eclipse Core +- Maven Integration for WTP (in m2eclipse extras) + Instructions for installing the maven plugins can be found here: + http://m2eclipse.sonatype.org/installing-m2eclipse.html + +Ensure Eclipse is configured to use Java 1.6 as this sample uses +AppEngine. + +In Eclipse, go to the File menu and choose: + + File -> Import... -> Existing Maven Projects into Workspace + + Select the directory containing this file. + + Click Finish. + +You can now browse the project in Eclipse. + +To compile your project for deployment, just type 'mvn package'. + +--------------NETBEANS----------------- + +From the NetBeans IDE, install the Maven plugin. To do this, select Tools->Plugins, select Maven, click Install, and follow the prompts. + +Configure Maven in NetBeans IDE. To do this, select Tools->Options, select Miscellaneous from the top panel, then select the Maven tab. + +For the External Maven Home field, browse to your Maven installation. + +If the option is available, check Always use external Maven for building projects. Close the dialog. + +From the NetBeans IDE, select File->Open Project, and then browse to the location of the project you'd like to open. + +Check Open as Main Project, then click Open Project. + +Right-click the project and select Run. diff --git a/build.xml b/build.xml deleted file mode 100644 index 03869cab6..000000000 --- a/build.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - Builds, tests, and runs the project tracker-server. - - - diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml deleted file mode 100644 index 37432878f..000000000 --- a/nbproject/build-impl.xml +++ /dev/null @@ -1,1053 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set src.dir - Must set test.src.dir - Must set build.dir - Must set dist.dir - Must set build.classes.dir - Must set dist.javadoc.dir - Must set build.test.classes.dir - Must set build.test.results.dir - Must set build.classes.excludes - Must set dist.jar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must set JVM to use for profiling in profiler.info.jvm - Must set profiler agent JVM arguments in profiler.info.jvmargs.agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - - - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set run.class - - - - Must select one file in the IDE or set run.class - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set debug.class - - - - - Must select one file in the IDE or set debug.class - - - - - Must set fix.includes - - - - - - - - - - - - - - - - - Must select one file in the IDE or set profile.class - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select some files in the IDE or set javac.includes - - - - - - - - - - - - - - - - - - - - Some tests failed; see details above. - - - - - - - - - Must select some files in the IDE or set test.includes - - - - Some tests failed; see details above. - - - - - Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - - - - - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - Must select one file in the IDE or set applet.url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties deleted file mode 100644 index 3a5d43391..000000000 --- a/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=06177666 -build.xml.script.CRC32=c43836c6 -build.xml.stylesheet.CRC32=28e38971@1.38.2.45 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=06177666 -nbproject/build-impl.xml.script.CRC32=d2f1c940 -nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.2.46 diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index 6a702265f..000000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,101 +0,0 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=false -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -application.title=tracker-server -application.vendor=user -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/tracker-server.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.h2-1.3.167.jar=/home/user/Documents/lib/h2-1.3.167.jar -file.reference.jetty-continuation-8.1.4.v20120524.jar=/home/user/Documents/lib/jetty/jetty-continuation-8.1.4.v20120524.jar -file.reference.jetty-http-8.1.4.v20120524.jar=/home/user/Documents/lib/jetty/jetty-http-8.1.4.v20120524.jar -file.reference.jetty-io-8.1.4.v20120524.jar=/home/user/Documents/lib/jetty/jetty-io-8.1.4.v20120524.jar -file.reference.jetty-server-8.1.4.v20120524.jar=/home/user/Documents/lib/jetty/jetty-server-8.1.4.v20120524.jar -file.reference.jetty-util-8.1.4.v20120524.jar=/home/user/Documents/lib/jetty/jetty-util-8.1.4.v20120524.jar -file.reference.junit-4.10.jar=/home/user/Documents/lib/junit-4.10.jar -file.reference.mysql-connector-java-5.1.21-bin.jar=/home/user/Documents/lib/mysql-connector-java-5.1.21-bin.jar -file.reference.netty-3.5.2.Final.jar=/home/user/Documents/lib/netty-3.5.2.Final.jar -file.reference.servlet-api-3.0.jar=/home/user/Documents/lib/jetty/servlet-api-3.0.jar -includes=** -jar.archive.disabled=${jnlp.enabled} -jar.compress=false -jar.index=${jnlp.enabled} -javac.classpath=\ - ${file.reference.h2-1.3.167.jar}:\ - ${file.reference.netty-3.5.2.Final.jar}:\ - ${file.reference.jetty-continuation-8.1.4.v20120524.jar}:\ - ${file.reference.jetty-http-8.1.4.v20120524.jar}:\ - ${file.reference.jetty-io-8.1.4.v20120524.jar}:\ - ${file.reference.jetty-server-8.1.4.v20120524.jar}:\ - ${file.reference.jetty-util-8.1.4.v20120524.jar}:\ - ${file.reference.servlet-api-3.0.jar}:\ - ${file.reference.mysql-connector-java-5.1.21-bin.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=true -javac.processorpath=\ - ${javac.classpath} -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${file.reference.junit-4.10.jar} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -jnlp.codebase.type=no.codebase -jnlp.descriptor=application -jnlp.enabled=false -jnlp.mixed.code=default -jnlp.offline-allowed=false -jnlp.signed=false -jnlp.signing= -jnlp.signing.alias= -jnlp.signing.keystore= -main.class=Main -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index ab723c074..000000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - org.netbeans.modules.java.j2seproject - - - tracker-server - - - - - - - - - diff --git a/pom.xml b/pom.xml index b6d4a5a6d..9e11580f3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.traccar traccar - 0.0.1-SNAPSHOT + 1.1.0-SNAPSHOT @@ -21,15 +21,25 @@ netty 3.5.2.Final - - javax.servlet - javax.servlet-api - 3.0.1 - junit junit 4.10 + + + tracker-server + target\classes + src + test + + + src + + **/*.java + + + + \ No newline at end of file -- cgit v1.2.3