From 026ea0706ffb93bd1b5029a5ed0d79196473f625 Mon Sep 17 00:00:00 2001 From: tiwalthe Date: Fri, 30 Nov 2012 13:28:28 +0100 Subject: [PATCH] commit auf HiDrive - woher auch immer die Aenderungen kommen --- .classpath | 27 +++++ .project | 29 +++++ .settings/org.eclipse.core.runtime.prefs | 3 + .settings/org.eclipse.jdt.core.prefs | 2 + .settings/org.maven.ide.eclipse.prefs | 8 ++ Notes.txt | 7 +- database/db.backup | Bin database/db.data | Bin database/db.properties | 0 database/db.script | 0 pom.xml | 113 +++++++++--------- resources/icon.png | Bin resources/icon.svg | 0 resources/icon1.png | Bin resources/icon2.png | Bin resources/icon3.png | Bin .../transactions/DatabaseController.java | 0 .../java/de/tilman/transactions/Service.java | 0 .../de/tilman/transactions/Transaktion.java | 0 src/main/java/org/example/HelloServlet.java | 0 src/main/java/org/example/HelloWorld.java | 0 src/webapp/WEB-INF/index.html | 0 src/webapp/WEB-INF/web.xml | 0 .../transactions/DatabaseController.class | Bin 6931 -> 6931 bytes .../transactions/Service$CsvServlet.class | Bin 3800 -> 3804 bytes .../transactions/Service$ReadServlet.class | Bin 9941 -> 9945 bytes .../transactions/Service$ShutdownThread.class | Bin 1037 -> 1037 bytes .../transactions/Service$StatsServlet.class | Bin 1911 -> 1915 bytes .../de/tilman/transactions/Service.class | Bin 7590 -> 7590 bytes .../de/tilman/transactions/Transaktion.class | Bin 1194 -> 1194 bytes target/classes/org/example/HelloServlet.class | Bin 1323 -> 1323 bytes target/classes/org/example/HelloWorld.class | Bin 1800 -> 1800 bytes 32 files changed, 133 insertions(+), 56 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/org.eclipse.core.runtime.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.maven.ide.eclipse.prefs mode change 100755 => 100644 Notes.txt mode change 100755 => 100644 database/db.backup mode change 100755 => 100644 database/db.data mode change 100755 => 100644 database/db.properties mode change 100755 => 100644 database/db.script mode change 100755 => 100644 pom.xml mode change 100755 => 100644 resources/icon.png mode change 100755 => 100644 resources/icon.svg mode change 100755 => 100644 resources/icon1.png mode change 100755 => 100644 resources/icon2.png mode change 100755 => 100644 resources/icon3.png mode change 100755 => 100644 src/main/java/de/tilman/transactions/DatabaseController.java mode change 100755 => 100644 src/main/java/de/tilman/transactions/Service.java mode change 100755 => 100644 src/main/java/de/tilman/transactions/Transaktion.java mode change 100755 => 100644 src/main/java/org/example/HelloServlet.java mode change 100755 => 100644 src/main/java/org/example/HelloWorld.java mode change 100755 => 100644 src/webapp/WEB-INF/index.html mode change 100755 => 100644 src/webapp/WEB-INF/web.xml mode change 100755 => 100644 target/classes/de/tilman/transactions/DatabaseController.class mode change 100755 => 100644 target/classes/de/tilman/transactions/Service$CsvServlet.class mode change 100755 => 100644 target/classes/de/tilman/transactions/Service$ReadServlet.class mode change 100755 => 100644 target/classes/de/tilman/transactions/Service$ShutdownThread.class mode change 100755 => 100644 target/classes/de/tilman/transactions/Service$StatsServlet.class mode change 100755 => 100644 target/classes/de/tilman/transactions/Service.class mode change 100755 => 100644 target/classes/de/tilman/transactions/Transaktion.class mode change 100755 => 100644 target/classes/org/example/HelloServlet.class mode change 100755 => 100644 target/classes/org/example/HelloWorld.class 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 f384660ec2cc03a135cbddc986d07b054c7e5943..8a0b2a75af1cdf7ed32bbbacb770743e64c4c43c GIT binary patch delta 33 pcmbPiHrY(z)W2Q(7#J9g83WlFm>3x}CnxfVPu|NWw9)dG6acdI3HSg2 delta 33 pcmbPiHrY(z)W2Q(7#J9g7z5cEm>3x}CnxfVPu|NWw9)dG6acc|3HJa1 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 f67b59d7262a0fab8ae1c9e3bfe69337093da39c..fe50a9da485e7e8b4315e7ac194e7152f3f25df0 GIT binary patch delta 61 zcmV-D0K)&+9o!ua%Ko~(0000p0NV!u0+Y}M8k4{Q60tcm3jt4)Z3`e15M00B_| T1p!h32?0|84gplNoC`byJ~s~v delta 57 zcmV-90LK5^9oQWW%Ko~(0000o0NV!u0+Y}M8k4{Q60tcm3js@$Z3`d|4gdoH00C40 P1p!h32?0~HpbI<$28Rxy 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 454f7a37ae75e4e7cbfa6bf39e6cdb2a3d8d7c85..d9f875da55c0e34b47fc3256dd206628dfa6d65b GIT binary patch delta 56 zcmccWd(&6o)W2Q(7#J9g8RxMxFflS{O;!|@+o;DS&6qXWQd*x~j)5I0+c7y`T9jFq Lp?h<)bPzWH()=;h!z^>5cc1_lP>jT`~YoV5&`jCBlrjP;Wfnb!aSoJ|Pv delta 31 ncmeC>=;h!z^>5cc1_lPBjT`~Yob?Q>jI|7$jCGR}nb!aSoA(Ik 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 9dd6a8afcef2b17ac9daf87b417a82c68506a5fe..d809c934c8bb6b04826a6d583c21e992d6a3cea9 GIT binary patch delta 60 zcmey)_nS}P)W2Q(7#J9g8DiNPm>3zfCl|7aZ&d%z%IH5?o=rhmh=GNHfzg(MmC=rY QlhK}mkI`YXADbp40PWTcvj6}9 delta 56 zcmey(_nlAR)W2Q(7#J9g7-HEOm>3zfCl|7aZ&d%z%IG~=o=t(DkAazifzg41mC=rY MlhJ;25Su0=0KN+hT>t<8 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 a0884f8e146bb6271217900bd5019c761ce99287..49c3f7e125aab1e496ea15a39e077bf2428d40e5 GIT binary patch delta 33 pcmZ2xz06wR)W2Q(7#J9g8B5t2m>3!4CQlR;pZt!6eWPB5EC9WH3NQcw delta 33 pcmZ2xz06wR)W2Q(7#J9g7)#k1m>3!4CQlR;pZt!6eWPB5EC9V{3NHWv 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 42502a0c2b4ed4e1e2d43cef91447ee2cbd74763..f4775b77a0ffe0b40028e286a957692e2855ae49 GIT binary patch delta 17 ZcmZ3*xr&qH)W2Q(7#J9gH*zdu0RTQe20;J- delta 17 ZcmZ3*xr&qH)W2Q(7#J9gHgYUt0RTQZ20#D+ diff --git a/target/classes/org/example/HelloServlet.class b/target/classes/org/example/HelloServlet.class old mode 100755 new mode 100644 index 8180b85b3ab429d92b3a458426c75e52c32cefd7..6951a5853b326b52d199163298999d77a42ac92c GIT binary patch delta 17 ZcmZ3@wVI3L)W2Q(7#J9gH*zSm0suXK1;+pY delta 17 ZcmZ3@wVI3L)W2Q(7#J9gHgYJl0suXF1;zjX diff --git a/target/classes/org/example/HelloWorld.class b/target/classes/org/example/HelloWorld.class old mode 100755 new mode 100644 index 3e8743d4ac6bf9c4f5a51e0c04ce970b50736416..3db85eaa0a3a3d63da75e74f273b3c59ddb68c3c GIT binary patch delta 16 XcmeC+>)_)!^>5cc1_lP>g&gbvGr|Q} delta 16 XcmeC+>)_)!^>5cc1_lPBg&gbvGrk2^