[resync-dev] [RESYNC GIT]Resync branch, Command, updated. 99f2305d5c4e80b127b07c13043b6277a72e0644
- From: git@xxxxxxx
- To: resync-dev@xxxxxxxxxxxxx
- Date: Sun, 18 Sep 2011 18:35:29 +0200
The branch, Command has been updated
via 99f2305d5c4e80b127b07c13043b6277a72e0644 (commit)
via f67d76c1b617d908f5cff0ebcc6fbd0f48b015b4 (commit)
via 7072595815a185c4e74054d11dc59dc5cd8e059f (commit)
via fd89ffa0aaf233b6368c4d1e0af630112b197037 (commit)
via 1867a0c51d521e7922cfee245b9ff4450cadb25e (commit)
via 08e5b2852a0ee982e59d9915cd092f28086d2677 (commit)
via 7de63cb09e7dad34e6d717095daf10bbfe44fc96 (commit)
via ccea2d918b398dc780fbf1479ac41eded2bf6be4 (commit)
via 0ff1e28c1ea8b5446d73d3eb3f90032db38fb9c7 (commit)
via ddc2eb1326be18303f2134e67a866e7efd0a840c (commit)
via 98a771eb3222bde768ae2a3034aee2ba97036b51 (commit)
via 1954da8088c1db64bb546a08da8b9341a025f734 (commit)
via 6387a61e0f2c2b746073dcae3f66817595a2cb47 (commit)
via 5bfccbfc6a9236e3b9fc74e819b678ee637ba50e (commit)
via 9aa42e28979bdf71ebfbdc693b8d5f5627bfe042 (commit)
via 857c213b4a85546a3e8a22c2bd90ccb1bb6ed253 (commit)
via 7e4c9453eb8686347d40ede53fe48c0a947816c6 (commit)
via 75c6b5e20aabe2e7311250d0f1cfa301d09058f5 (commit)
via 5af2f81764615c12c6e94079ba4bd5df7c1d0abe (commit)
via 8466d5575b846916bf99c24c6f216d6345d47484 (commit)
via f5fb9602e12aaf38298d64401c8e19251841412c (commit)
via 310c1e4358816a15f4ca03bb1e9db59c1438b6f8 (commit)
via ff8d875c77991b17b648ce8d62b92f6f71eff9fb (commit)
via 13fff5ac365e7ad2b2190a4829f90cc3aad55703 (commit)
via 7ebc9ea940dac3f2efac3af54542c8b7de8ff81d (commit)
via 91fad94a9fb4c36b123bfbedd8a0f282ea2a5cb3 (commit)
via 92087727147afb19764c31c6d4d1cbb6b56931e1 (commit)
via 8eff2d8b5ce14cde22f402ff05fdf3f8d4114353 (commit)
via 28587b7c7b375f1459a0a1bb18c012f2631a2be0 (commit)
via df91952b6d83ddbd5844da5faeb91f46b4a512e7 (commit)
via fb76a5b3038ba3474166f806d9a809128ea24fd2 (commit)
via 960108712856daf632a3db3ba6a9672807986642 (commit)
via 136fbd31181d2835ceb1a6f4727e45faeaa6f2d8 (commit)
via 284d6ebc6d55cb6e336a44c8f68e4fe1893be889 (commit)
via edbbb921e40d0b3c58ef3a19dc6d45b1d723049b (commit)
via 23dbde9d1d8708b7b2b8f8ced3ca8f576ce5aced (commit)
via 236e0cfa2bda5de5785083fc40329097c3b14e46 (commit)
via 19c9be491f0b91ba48ed66dfe38104d77f958a72 (commit)
via a26b162e8b10141e2a84a13958d897bc5e0b9b56 (commit)
via a92329226c58f14afd29fab527d6129ab9ac90d5 (commit)
via bc87ab8fef8f5d161cf968bf3eb38c6cc6062180 (commit)
via afc492abb96df4612e03b3e4fd684bdc80b2cf4f (commit)
via fb7177c4083c637c459612486f9d5ff8140df101 (commit)
from fc8cdf458ab2d6b9bd5eb341ad7dc495be997417 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 99f2305d5c4e80b127b07c13043b6277a72e0644
Merge: fc8cdf458ab2d6b9bd5eb341ad7dc495be997417
f67d76c1b617d908f5cff0ebcc6fbd0f48b015b4
Author: Arne <arne@arne-desktop.(none)>
Date: Sun Sep 18 18:35:18 2011 +0200
Merge branch 'master' of ssh://rnae.de/resync into Command
Conflicts resolved:
translation/src/main/java/de/rnae/resync/translation/Translator.java
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
client/pom.xml | 121 ++++++++++++--
client/src/main/java/de/rnae/resync/Main.java | 34 ----
.../src/main/java/de/rnae/resync/client/Main.java | 52 ++++++
.../rnae/resync/{ => client}/bibtex/BibTool.java | 4 +-
.../persistence/SessionFactoryUtil.java | 2 +-
.../persistence/datatype/Attachment.java | 10 +-
.../persistence/datatype/Attribute.java | 27 +---
.../persistence/datatype/BibToolParameter.java | 18 +--
.../persistence/datatype/Category.java | 16 +-
.../{ => client}/persistence/datatype/Comment.java | 18 +--
.../persistence/datatype/Datatype.java | 3 +-
.../persistence/datatype/MandatoryAttribute.java | 11 +-
.../{ => client}/persistence/datatype/Paper.java | 21 ++-
.../persistence/datatype/Reference.java | 39 +++--
.../persistence/datatype/ReferenceType.java | 10 +-
.../{ => client}/persistence/datatype/User.java | 12 +--
client/src/main/resources/hibernate.cfg.xml | 23 ++--
.../{ => client}/persistence/PersistenceTest.java | 3 +-
common/pom.xml | 100 +++++++++++-
.../main/java/de/rnae/resync/{ => common}/App.java | 2 +-
.../resync/{ => common}/datatype/Datatype.java | 21 ++-
.../de/rnae/resync/common/datatype/Source.java | 12 ++
.../java/de/rnae/resync/common/datatype/Type.java | 13 ++
.../java/de/rnae/resync/common/util/Cache.java | 43 +++++
.../main/java/de/rnae/resync/common/util/Dao.java | 27 +++
.../util/InitializedConcurrentHashMap.java | 2 +-
.../{ => common}/util/InitializedHashMap.java | 2 +-
.../de/rnae/resync/{ => common}/util/Streams.java | 2 +-
.../rnae/resync/{ => common}/util/Validator.java | 2 +-
.../src/main/java/de/rnae/resync/util/Cache.java | 37 -----
.../resync/{ => common}/util/ValidatorTest.java | 2 +-
jars/annotations.jar | Bin 9954 -> 0 bytes
pom.xml | 27 +++-
server/pom.xml | 115 ++++++++++++--
.../java/de/rnae/resync/{ => server}/Main.java | 2 +-
translation/pom.xml | 63 ++++---
.../translation/TranslateAnnotationProcessor.java | 170 ++++++++++++++++---
.../de/rnae/resync/translation/Translator.java | 11 +-
.../{ => translation}/SetMethodSetterTest.java | 2 +-
.../resync/{ => translation}/TranslatorTest.java | 28 +++-
.../de_DE/de.rnae.resync.bibtex.BibTool.properties | 2 -
...de.rnae.resync.client.bibtex.BibTool.properties | 2 +
...de.rnae.resync.common.util.Validator.properties | 1 +
...translation.TranslatorTest.TestClass.properties | 5 +
.../de_DE/de.rnae.resync.util.Validator.properties | 1 -
.../en_EN/de.rnae.resync.bibtex.BibTool.properties | 2 -
...de.rnae.resync.client.bibtex.BibTool.properties | 3 +
...de.rnae.resync.common.util.Validator.properties | 1 +
...translation.TranslatorTest.TestClass.properties | 5 +
.../en_EN/de.rnae.resync.util.Validator.properties | 1 -
validation/pom.xml | 20 +++
.../main/java/de/rnae/resync/BinaryValidator.java | 46 ++++++
.../de/rnae/resync/TranslationLogValidator.java | 135 ++++++++++++++++
54 files changed, 1008 insertions(+), 324 deletions(-)
delete mode 100644 client/src/main/java/de/rnae/resync/Main.java
create mode 100644 client/src/main/java/de/rnae/resync/client/Main.java
rename client/src/main/java/de/rnae/resync/{ => client}/bibtex/BibTool.java
(98%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/SessionFactoryUtil.java (93%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/datatype/Attachment.java (71%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/datatype/Attribute.java (56%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/datatype/BibToolParameter.java (60%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/datatype/Category.java (66%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/datatype/Comment.java (70%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/datatype/Datatype.java (92%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/datatype/MandatoryAttribute.java (71%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/datatype/Paper.java (68%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/datatype/Reference.java (57%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/datatype/ReferenceType.java (75%)
rename client/src/main/java/de/rnae/resync/{ =>
client}/persistence/datatype/User.java (64%)
rename client/src/test/java/de/rnae/resync/{ =>
client}/persistence/PersistenceTest.java (87%)
rename common/src/main/java/de/rnae/resync/{ => common}/App.java (85%)
rename common/src/main/java/de/rnae/resync/{ => common}/datatype/Datatype.java
(68%)
create mode 100644
common/src/main/java/de/rnae/resync/common/datatype/Source.java
create mode 100644
common/src/main/java/de/rnae/resync/common/datatype/Type.java
create mode 100644 common/src/main/java/de/rnae/resync/common/util/Cache.java
create mode 100644 common/src/main/java/de/rnae/resync/common/util/Dao.java
rename common/src/main/java/de/rnae/resync/{ =>
common}/util/InitializedConcurrentHashMap.java (97%)
rename common/src/main/java/de/rnae/resync/{ =>
common}/util/InitializedHashMap.java (96%)
rename common/src/main/java/de/rnae/resync/{ => common}/util/Streams.java (95%)
rename common/src/main/java/de/rnae/resync/{ => common}/util/Validator.java
(97%)
delete mode 100644 common/src/main/java/de/rnae/resync/util/Cache.java
rename common/src/test/java/de/rnae/resync/{ =>
common}/util/ValidatorTest.java (97%)
delete mode 100644 jars/annotations.jar
rename server/src/main/java/de/rnae/resync/{ => server}/Main.java (91%)
rename translation/src/test/java/de/rnae/resync/{ =>
translation}/SetMethodSetterTest.java (97%)
rename translation/src/test/java/de/rnae/resync/{ =>
translation}/TranslatorTest.java (71%)
delete mode 100644 translations/de_DE/de.rnae.resync.bibtex.BibTool.properties
create mode 100644
translations/de_DE/de.rnae.resync.client.bibtex.BibTool.properties
create mode 100644
translations/de_DE/de.rnae.resync.common.util.Validator.properties
create mode 100644
translations/de_DE/de.rnae.resync.translation.TranslatorTest.TestClass.properties
delete mode 100644 translations/de_DE/de.rnae.resync.util.Validator.properties
delete mode 100644 translations/en_EN/de.rnae.resync.bibtex.BibTool.properties
create mode 100644
translations/en_EN/de.rnae.resync.client.bibtex.BibTool.properties
create mode 100644
translations/en_EN/de.rnae.resync.common.util.Validator.properties
create mode 100644
translations/en_EN/de.rnae.resync.translation.TranslatorTest.TestClass.properties
delete mode 100644 translations/en_EN/de.rnae.resync.util.Validator.properties
create mode 100644 validation/pom.xml
create mode 100644 validation/src/main/java/de/rnae/resync/BinaryValidator.java
create mode 100644
validation/src/main/java/de/rnae/resync/TranslationLogValidator.java
hooks/post-receive
--
Resync
Other related posts:
- » [resync-dev] [RESYNC GIT]Resync branch, Command, updated. 99f2305d5c4e80b127b07c13043b6277a72e0644 - git
