diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..1510f2c --- /dev/null +++ b/.classpath @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..bd751c5 --- /dev/null +++ b/.project @@ -0,0 +1,29 @@ + + + Transaktionen + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.maven.ide.eclipse.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/.settings/org.eclipse.core.runtime.prefs b/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000..5e3b9e2 --- /dev/null +++ b/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Thu Dec 22 10:40:15 CET 2011 +eclipse.preferences.version=1 +line.separator=\n diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..4ede96d --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 0000000..4bb0d93 --- /dev/null +++ b/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,8 @@ +#Mon Sep 12 11:28:16 CEST 2011 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/Notes.txt b/Notes.txt old mode 100755 new mode 100644 index 8d05c8c..1e8cb38 --- a/Notes.txt +++ b/Notes.txt @@ -51,4 +51,9 @@ CREATE CACHED TABLE "Kategorien_Tilman"("ID" INTEGER GENERATED BY DEFAULT AS IDE CREATE CACHED TABLE "Transaktionen_Tilman"("ID" INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,"Datum" DATE NOT NULL,"Kategorie" INTEGER NOT NULL,"Betrag" DECIMAL(50,2) NOT NULL,"Beschreibung" VARCHAR(255)); ALTER TABLE "Transaktionen" ADD "Auslage" INTEGER DEFAULT 0 NOT NULL; -INSERT INTO "Kategorien_Tilman" VALUES (null, 'Freizeit - Sport') \ No newline at end of file +INSERT INTO "Kategorien_Tilman" VALUES (null, 'Freizeit - Sport') + +Neue Kategorie einfügen: +UPDATE "Kategorien" SET "ID"="ID"+1 WHERE "ID">7; +UPDATE "Transaktionen" SET "Kategorie"="Kategorie"+1 WHERE "Kategorie">7; +INSERT INTO "Kategorien" ("ID", "Name") VALUES (8, 'Familie - Baby'); \ No newline at end of file diff --git a/database/db.backup b/database/db.backup old mode 100755 new mode 100644 diff --git a/database/db.data b/database/db.data old mode 100755 new mode 100644 diff --git a/database/db.properties b/database/db.properties old mode 100755 new mode 100644 diff --git a/database/db.script b/database/db.script old mode 100755 new mode 100644 diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 index 5a3ee53..c76f450 --- a/pom.xml +++ b/pom.xml @@ -1,56 +1,59 @@ - - 4.0.0 - Transaktionen - Transaktionen - 0.0.1-SNAPSHOT - - - - org.mortbay.jetty - jetty-maven-plugin - 8.0.1.v20110908 - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - java - - - org.example.HelloWorld - - - - - - - log4j - log4j - 1.2.14 - jar - compile - - - org.mortbay.jetty - jetty-embedded - 6.1.26 - jar - compile - - - hsqldb - hsqldb - 1.8.0.10 - jar - compile - - - org.apache.commons - commons-lang3 - 3.0.1 - jar - compile - - + + 4.0.0 + Transaktionen + Transaktionen + 0.0.1-SNAPSHOT + + + + org.mortbay.jetty + jetty-maven-plugin + 8.0.1.v20110908 + + + org.codehaus.mojo + exec-maven-plugin + 1.2 + + + + java + + + + + org.example.HelloWorld + + + + + + + log4j + log4j + 1.2.17 + + + org.mortbay.jetty + jetty-embedded + 6.1.26 + jar + compile + + + hsqldb + hsqldb + 1.8.0.10 + jar + compile + + + org.apache.commons + commons-lang3 + 3.0.1 + jar + compile + + \ No newline at end of file diff --git a/resources/icon.png b/resources/icon.png old mode 100755 new mode 100644 diff --git a/resources/icon.svg b/resources/icon.svg old mode 100755 new mode 100644 diff --git a/resources/icon1.png b/resources/icon1.png old mode 100755 new mode 100644 diff --git a/resources/icon2.png b/resources/icon2.png old mode 100755 new mode 100644 diff --git a/resources/icon3.png b/resources/icon3.png old mode 100755 new mode 100644 diff --git a/src/main/java/de/tilman/transactions/DatabaseController.java b/src/main/java/de/tilman/transactions/DatabaseController.java old mode 100755 new mode 100644 diff --git a/src/main/java/de/tilman/transactions/Service.java b/src/main/java/de/tilman/transactions/Service.java old mode 100755 new mode 100644 diff --git a/src/main/java/de/tilman/transactions/Transaktion.java b/src/main/java/de/tilman/transactions/Transaktion.java old mode 100755 new mode 100644 diff --git a/src/main/java/org/example/HelloServlet.java b/src/main/java/org/example/HelloServlet.java old mode 100755 new mode 100644 diff --git a/src/main/java/org/example/HelloWorld.java b/src/main/java/org/example/HelloWorld.java old mode 100755 new mode 100644 diff --git a/src/webapp/WEB-INF/index.html b/src/webapp/WEB-INF/index.html old mode 100755 new mode 100644 diff --git a/src/webapp/WEB-INF/web.xml b/src/webapp/WEB-INF/web.xml old mode 100755 new mode 100644 diff --git a/target/classes/de/tilman/transactions/DatabaseController.class b/target/classes/de/tilman/transactions/DatabaseController.class old mode 100755 new mode 100644 index f384660..8a0b2a7 Binary files a/target/classes/de/tilman/transactions/DatabaseController.class and b/target/classes/de/tilman/transactions/DatabaseController.class differ diff --git a/target/classes/de/tilman/transactions/Service$CsvServlet.class b/target/classes/de/tilman/transactions/Service$CsvServlet.class old mode 100755 new mode 100644 index f67b59d..fe50a9d Binary files a/target/classes/de/tilman/transactions/Service$CsvServlet.class and b/target/classes/de/tilman/transactions/Service$CsvServlet.class differ diff --git a/target/classes/de/tilman/transactions/Service$ReadServlet.class b/target/classes/de/tilman/transactions/Service$ReadServlet.class old mode 100755 new mode 100644 index 454f7a3..d9f875d Binary files a/target/classes/de/tilman/transactions/Service$ReadServlet.class and b/target/classes/de/tilman/transactions/Service$ReadServlet.class differ diff --git a/target/classes/de/tilman/transactions/Service$ShutdownThread.class b/target/classes/de/tilman/transactions/Service$ShutdownThread.class old mode 100755 new mode 100644 index 1470aec..881b790 Binary files a/target/classes/de/tilman/transactions/Service$ShutdownThread.class and b/target/classes/de/tilman/transactions/Service$ShutdownThread.class differ diff --git a/target/classes/de/tilman/transactions/Service$StatsServlet.class b/target/classes/de/tilman/transactions/Service$StatsServlet.class old mode 100755 new mode 100644 index 9dd6a8a..d809c93 Binary files a/target/classes/de/tilman/transactions/Service$StatsServlet.class and b/target/classes/de/tilman/transactions/Service$StatsServlet.class differ diff --git a/target/classes/de/tilman/transactions/Service.class b/target/classes/de/tilman/transactions/Service.class old mode 100755 new mode 100644 index a0884f8..49c3f7e Binary files a/target/classes/de/tilman/transactions/Service.class and b/target/classes/de/tilman/transactions/Service.class differ diff --git a/target/classes/de/tilman/transactions/Transaktion.class b/target/classes/de/tilman/transactions/Transaktion.class old mode 100755 new mode 100644 index 42502a0..f4775b7 Binary files a/target/classes/de/tilman/transactions/Transaktion.class and b/target/classes/de/tilman/transactions/Transaktion.class differ diff --git a/target/classes/org/example/HelloServlet.class b/target/classes/org/example/HelloServlet.class old mode 100755 new mode 100644 index 8180b85..6951a58 Binary files a/target/classes/org/example/HelloServlet.class and b/target/classes/org/example/HelloServlet.class differ diff --git a/target/classes/org/example/HelloWorld.class b/target/classes/org/example/HelloWorld.class old mode 100755 new mode 100644 index 3e8743d..3db85ea Binary files a/target/classes/org/example/HelloWorld.class and b/target/classes/org/example/HelloWorld.class differ