eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-15 16:51:07 +00:00
Code Activity

move Shiro JARs and ehcache to target platform; adjusting target definitions

Browse Source
This commit is contained in:
Axel Uhl committed 2014-11-04 17:32:41 +01:00
1 parent 054b7d7709
commit eaca3e439c
18 files changed
+82 -56
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.targetplatform.base/features/target-shiro/feature.xml
+50 -35
View File
@@ -1,35 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="com.sap.sailing.target.jsp"
label="Apache Shiro libraries"
version="1.0.0">
<description>
Java Server Pages libraries
</description>
<license url="">
NA.
</license>
<plugin
id="org.apache.shiro"
download-size="0"
install-size="0"
version="2.1.0.v201105211819"
unpack="false"/>
<plugin
id="org.apache.shiro.web"
download-size="0"
install-size="0"
version="2.1.0.v201105211819"
unpack="false"/>
<plugin
id="org.scribe"
download-size="0"
install-size="0"
version="2.1.0.v201105211819"
unpack="false"/>
</feature>
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="com.sap.sailing.target.shiro"
label="Apache Shiro libraries"
version="1.0.0">
<description>
Java Server Pages libraries
</description>
<license url="">
NA.
</license>
<plugin
id="org.apache.shiro.core"
download-size="0"
install-size="0"
version="1.2.2"
unpack="false"/>
<plugin
id="org.apache.shiro.web"
download-size="0"
install-size="0"
version="1.2.2"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.scribe"
download-size="0"
install-size="0"
version="1.3.3.1"
unpack="false"/>
<plugin
id="org.apache.shiro.ehcache"
download-size="0"
install-size="0"
version="1.2.3"
unpack="false"/>
<plugin
id="org.apache.servicemix.bundles.ehcache"
download-size="0"
install-size="0"
version="2.6.9.1"
unpack="false"/>
</feature>
java/com.sap.sailing.targetplatform.base/plugins/target-shiro/org.apache.servicemix.bundles.ehcache-2.6.9_1.jar
Executable
BIN
View File
Binary file not shown.
java/com.sap.sse.security/lib/shiro-ehcache-1.2.3.jar → java/com.sap.sailing.targetplatform.base/plugins/target-shiro/shiro-ehcache-1.2.3.jar
View File
File renamed without changes.
java/com.sap.sailing.targetplatform.base/site.xml
+3
View File
@@ -15,5 +15,8 @@
<feature url="features/target-restlet/com.sap.sailing.target.restlet_1.0.0.jar" id="com.sap.sailing.target.restlet" version="1.0.0">
<category name="RaceAnalysisTarget"/>
</feature>
<feature url="features/target-shiro/com.sap.sailing.target.shiro_1.0.0.jar" id="com.sap.sailing.target.shiro" version="1.0.0">
<category name="RaceAnalysisTarget"/>
</feature>
<category-def name="RaceAnalysisTarget" label="Race Analysis Target-Platform"/>
</site>
java/com.sap.sailing.targetplatform.updater/TargetPlatformUpdater.launch
+1 -1
View File
@@ -9,5 +9,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.launcher.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consolelog -nosplash -verbose -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher -metadataRepository &quot;file:/${project_loc:com.sap.sailing.targetplatform.base}/gen/p2&quot; -artifactRepository &quot;file:/${project_loc:com.sap.sailing.targetplatform.base}/gen/p2&quot; -source &quot;${project_loc:com.sap.sailing.targetplatform.base}&quot; -publishArtifacts -publishArtifactRepository -compress -noDefaultIUs"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.targetplatform.updater"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-jar ${eclipse_home}plugins/org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-jar ${eclipse_home}plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar"/>
</launchConfiguration>
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
+1
View File
@@ -4,6 +4,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.jms.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.shiro.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
<repository location="http://p2.sapsailing.com/p2/sailing/"/>
</location>
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-p2admin.target
+6
View File
@@ -35,6 +35,12 @@
<repository location="http://download.eclipse.org/releases/luna"/>
</location>
<location path="${project_loc:com.sap.sailing.targetplatform.base}/gen/p2" type="Directory">
<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.jms.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.shiro.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.apache.commons.fileupload" version="1.2.2.v20111214-1400"/>
<unit id="org.apache.commons.fileupload.source" version="1.2.2.v20111214-1400"/>
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target
+2 -1
View File
@@ -9,8 +9,9 @@
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.jms.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.shiro.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
<repository location="http://p2.sapsailing.com/p2/sailing/"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-local.target
+2 -1
View File
@@ -5,8 +5,9 @@
<locations>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.jms.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.shiro.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
<repository location="http://p2.sapsailing.com/p2/sailing/"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
java/com.sap.sailing.targetplatform/scripts/createLocalBaseP2repository.sh
+6 -2
View File
@@ -1,7 +1,11 @@
#!/bin/bash
set -u
ECLIPSE_HOME=C:/Users/D056866/Sailing/eclipse
SAILING_GIT_HOME=C:/Users/D056866/Sailing/git
if [ "$ECLIPSE_HOME" = "" ]; then
ECLIPSE_HOME=C:/Users/D056866/Sailing/eclipse
fi
if [ "$SAILING_GIT_HOME" = "" ]; then
SAILING_GIT_HOME=C:/Users/D056866/Sailing/git
fi
TARGET_PLATFORM_BASE_DIR=${SAILING_GIT_HOME}/java/com.sap.sailing.targetplatform.base
ECLIPSE_VM_ARGS="-Xmx256m"
java/com.sap.sse.security/.classpath
+9 -14
View File
@@ -1,14 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.4.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/shiro-core-1.2.2.jar" sourcepath="lib/shiro-core-1.2.2-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/shiro-web-1.2.2.jar" sourcepath="lib/shiro-web-1.2.2-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/shiro-ehcache-1.2.3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
<classpathentry exported="true" kind="lib" path="lib/org.apache.servicemix.bundles.scribe-1.3.3_1.jar" sourcepath="C:/Users/D056866/Sailing/scribe-java-master/src"/>
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
java/com.sap.sse.security/build.properties
+2 -2
View File
@@ -8,5 +8,5 @@ bin.includes = META-INF/,\
lib/org.apache.servicemix.bundles.scribe-1.3.3_1.jar,\
lib/shiro-core-1.2.2.jar,\
lib/shiro-web-1.2.2.jar,\
lib/shiro-ehcache-1.2.3.jar,\
lib/ehcache-core-2.4.7.jar
plugins/target-shiro/shiro-ehcache-1.2.3.jar,\
plugins/target-shiro/ehcache-core-2.4.7.jar
java/com.sap.sse.security/lib/ehcache-core-2.4.7.jar
BIN
View File
Binary file not shown.
java/com.sap.sse.security/lib/org.apache.servicemix.bundles.scribe-1.3.3_1.jar
BIN
View File
Binary file not shown.
java/com.sap.sse.security/lib/shiro-core-1.2.2-sources.jar
BIN
View File
Binary file not shown.
java/com.sap.sse.security/lib/shiro-core-1.2.2.jar
BIN
View File
Binary file not shown.
java/com.sap.sse.security/lib/shiro-web-1.2.2-sources.jar
BIN
View File
Binary file not shown.
java/com.sap.sse.security/lib/shiro-web-1.2.2.jar
BIN
View File
Binary file not shown.