Merge branch 'racecommittee_integrated' of

ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
This commit is contained in:
Armin Zamani committed 2013-04-11 00:28:12 +02:00
commit b501d1ca6f
2382 files changed
+1283491 -1283408

No files matched your search

@@ -1,25 +1,25 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Server Replication
Bundle-SymbolicName: com.sap.sailing.server.replication
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: com.sap.sailing.server.replication.impl.Activator
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Export-Package: com.sap.sailing.server.replication
Require-Bundle: com.sap.sailing.server,
com.sap.sailing.server.gateway,
com.sap.sailing.domain.common,
com.sap.sailing.domain,
com.sap.sailing.operationaltransformation,
com.sap.sailing.domain.persistence,
com.sap.sailing.domain.shared.android;bundle-version="1.0.0"
Bundle-ClassPath: .
Web-ContextPath: /replication
Import-Package: com.rabbitmq.client;version="2.8.4",
javax.management.j2ee.statistics;version="1.1.0",
javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
org.osgi.framework;version="1.6.0",
org.osgi.util.tracker;version="1.5.0"
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Server Replication
Bundle-SymbolicName: com.sap.sailing.server.replication
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: com.sap.sailing.server.replication.impl.Activator
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Export-Package: com.sap.sailing.server.replication
Require-Bundle: com.sap.sailing.server,
com.sap.sailing.server.gateway,
com.sap.sailing.domain.common,
com.sap.sailing.domain,
com.sap.sailing.operationaltransformation,
com.sap.sailing.domain.persistence,
com.sap.sailing.domain.shared.android;bundle-version="1.0.0"
Bundle-ClassPath: .
Web-ContextPath: /replication
Import-Package: com.rabbitmq.client;version="2.8.4",
javax.management.j2ee.statistics;version="1.1.0",
javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
org.osgi.framework;version="1.6.0",
org.osgi.util.tracker;version="1.5.0"