updates

vogella · vogella · commit cc9ccd610fdf · 2012-10-12T14:02:01.000+02:00
diff --git a/com.vogella.e4.rcp.blueprintservice.api/.classpath b/com.vogella.e4.rcp.blueprintservice.api/.classpath
@@ -0,0 +1,7 @@
+<?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="output" path="target"/>
+</classpath>
diff --git a/com.vogella.e4.rcp.blueprintservice.api/.project b/com.vogella.e4.rcp.blueprintservice.api/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.vogella.e4.rcp.blueprintservice.api</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/com.vogella.e4.rcp.blueprintservice.api/.settings/org.eclipse.jdt.core.prefs b/com.vogella.e4.rcp.blueprintservice.api/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/com.vogella.e4.rcp.blueprintservice.api/META-INF/MANIFEST.MF b/com.vogella.e4.rcp.blueprintservice.api/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Api
+Bundle-SymbolicName: com.vogella.e4.rcp.blueprintservice.api
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Felix Heppner
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: com.vogella.e4.rcp.blueprintservice.api
diff --git a/com.vogella.e4.rcp.blueprintservice.api/build.properties b/com.vogella.e4.rcp.blueprintservice.api/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = target/
+bin.includes = META-INF/,\
+               .
diff --git a/com.vogella.e4.rcp.blueprintservice.api/src/com/vogella/e4/rcp/blueprintservice/api/IService.java b/com.vogella.e4.rcp.blueprintservice.api/src/com/vogella/e4/rcp/blueprintservice/api/IService.java
@@ -0,0 +1,7 @@
+package com.vogella.e4.rcp.blueprintservice.api;
+
+public interface IService {
+
+	
+	String getConfig();
+}
diff --git a/com.vogella.e4.rcp.blueprintservice.api/target/com/vogella/e4/rcp/blueprintservice/api/IService.class b/com.vogella.e4.rcp.blueprintservice.api/target/com/vogella/e4/rcp/blueprintservice/api/IService.class
diff --git a/com.vogella.e4.rcp.blueprintservice.feature/.project b/com.vogella.e4.rcp.blueprintservice.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.vogella.e4.rcp.blueprintservice.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/com.vogella.e4.rcp.blueprintservice.feature/build.properties b/com.vogella.e4.rcp.blueprintservice.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/com.vogella.e4.rcp.blueprintservice.feature/feature.xml b/com.vogella.e4.rcp.blueprintservice.feature/feature.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.vogella.e4.rcp.bluepringservice.feature"
+      label="Feature"
+      version="1.0.0.qualifier"
+      provider-name="Felix Heppner">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="com.vogella.e4.rcp.blueprintservice.service"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.vogella.e4.rcp.blueprintservice.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.vogella.e4.rcp.blueprintservice"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/com.vogella.e4.rcp.blueprintservice.service/.classpath b/com.vogella.e4.rcp.blueprintservice.service/.classpath
@@ -0,0 +1,7 @@
+<?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.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="target"/>
+</classpath>
diff --git a/com.vogella.e4.rcp.blueprintservice.service/.project b/com.vogella.e4.rcp.blueprintservice.service/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.vogella.e4.rcp.blueprintservice.service</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/com.vogella.e4.rcp.blueprintservice.service/.settings/org.eclipse.jdt.core.prefs b/com.vogella.e4.rcp.blueprintservice.service/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/com.vogella.e4.rcp.blueprintservice.service/.settings/org.springframework.ide.eclipse.beans.core.prefs b/com.vogella.e4.rcp.blueprintservice.service/.settings/org.springframework.ide.eclipse.beans.core.prefs
@@ -0,0 +1,31 @@
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.osgi.org/xmlns/blueprint/v1.0.0=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/aop=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/beans=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/c=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/cache=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/context=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/jee=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/lang=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/osgi=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/osgi-compendium=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/p=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/task=
+//org.springframework.ide.eclipse.beans.core.default.version.http\://www.springframework.org/schema/util=
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.osgi.org/xmlns/blueprint/v1.0.0=bp
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/aop=aop
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/beans=beans
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/c=c
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/cache=cache
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/context=context
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/jee=jee
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/lang=lang
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/osgi=osgi
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/osgi-compendium=osgix
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/p=p
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/task=task
+//org.springframework.ide.eclipse.beans.core.prefix.http\://www.springframework.org/schema/util=util
+eclipse.preferences.version=1
+org.springframework.ide.eclipse.beans.core.default.version.check.classpath=true
+org.springframework.ide.eclipse.beans.core.enable.project.preferences=true
+org.springframework.ide.eclipse.beans.core.ignoreMissingNamespaceHandler=true
+org.springframework.ide.eclipse.beans.core.loadNamespaceHandlerFromClasspath=true
diff --git a/com.vogella.e4.rcp.blueprintservice.service/.springBeans b/com.vogella.e4.rcp.blueprintservice.service/.springBeans
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[3.1.0.201209281029-CI-B122]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[true]]></enableImports>
+	<configs>
+		<config>META-INF/spring/osgi-context.xml</config>
+	</configs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>
diff --git a/com.vogella.e4.rcp.blueprintservice.service/META-INF/MANIFEST.MF b/com.vogella.e4.rcp.blueprintservice.service/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Service
+Bundle-SymbolicName: com.vogella.e4.rcp.blueprintservice.service
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Felix Heppner
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: com.vogella.e4.rcp.blueprintservice.api;bundle-version="1.0.0"
+Bundle-ActivationPolicy: lazy
diff --git a/com.vogella.e4.rcp.blueprintservice.service/META-INF/spring/osgi-context.xml b/com.vogella.e4.rcp.blueprintservice.service/META-INF/spring/osgi-context.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:osgi="http://www.springframework.org/schema/osgi"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd">
+
+	<osgi:service id="springOsgiService" ref="service"
+		interface="com.vogella.e4.rcp.blueprintservice.api.IService" />
+
+	<bean id="service"
+		class="com.vogella.e4.rcp.blueprintservice.service.SpringService">
+		<property name="config" value="MyTestConfig" />
+	</bean>
+
+</beans>
+
+
+
diff --git a/com.vogella.e4.rcp.blueprintservice.service/build.properties b/com.vogella.e4.rcp.blueprintservice.service/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = target/
+bin.includes = META-INF/,\
+               .
diff --git a/com.vogella.e4.rcp.blueprintservice.service/src/com/vogella/e4/rcp/blueprintservice/service/SpringService.java b/com.vogella.e4.rcp.blueprintservice.service/src/com/vogella/e4/rcp/blueprintservice/service/SpringService.java
@@ -0,0 +1,18 @@
+package com.vogella.e4.rcp.blueprintservice.service;
+
+import com.vogella.e4.rcp.blueprintservice.api.IService;
+
+public class SpringService  implements IService{
+
+	private String config;
+	
+	
+	public void setConfig(String config) {
+		this.config = config;
+	}
+	
+	public String getConfig() {
+		return config;
+	}
+	
+}
diff --git a/com.vogella.e4.rcp.blueprintservice.service/target/com/vogella/e4/rcp/blueprintservice/service/SpringService.class b/com.vogella.e4.rcp.blueprintservice.service/target/com/vogella/e4/rcp/blueprintservice/service/SpringService.class
diff --git a/com.vogella.e4.rcp.blueprintservice/META-INF/MANIFEST.MF b/com.vogella.e4.rcp.blueprintservice/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Blueprintservice
-Bundle-SymbolicName: com.vogella.e4.rcp.blueprintservice; singleton:=true
+Bundle-SymbolicName: com.vogella.e4.rcp.blueprintservice;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: VOGELLA
 Require-Bundle: javax.inject;bundle-version="1.0.0",
@@ -22,5 +22,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.e4.ui.css.core;bundle-version="0.10.2",
  org.w3c.css.sac;bundle-version="1.3.1",
  org.eclipse.e4.core.commands;bundle-version="0.10.1",
- org.eclipse.e4.ui.bindings;bundle-version="0.10.1"
+ org.eclipse.e4.ui.bindings;bundle-version="0.10.1",
+ com.vogella.e4.rcp.blueprintservice.api;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/com.vogella.e4.rcp.blueprintservice/com.vogella.e4.rcp.blueprintservice.product b/com.vogella.e4.rcp.blueprintservice/com.vogella.e4.rcp.blueprintservice.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="com.vogella.e4.rcp.blueprintservice" id="com.vogella.e4.rcp.blueprintservice.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="com.vogella.e4.rcp.blueprintservice" id="com.vogella.e4.rcp.blueprintservice.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -14,8 +14,8 @@
    <windowImages/>
 
    <plugins>
-      <plugin id="com.vogella.e4.rcp.blueprintservice"/>
       <plugin id="com.ibm.icu"/>
+      <plugin id="com.vogella.e4.rcp.blueprintservice"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.inject"/>
       <plugin id="javax.xml"/>
@@ -103,5 +103,17 @@
       <plugin id="org.w3c.dom.svg"/>
    </plugins>
 
+   <features>
+      <feature id="com.vogella.e4.rcp.bluepringservice.feature" version="1.0.0.qualifier"/>
+      <feature id="com.vogealla.e4.rcp.springextender" version="1.0.0.qualifier"/>
+      <feature id="org.eclipse.e4.rcp" version="1.1.0.v20120521-2329-8yFTIGIbGGduEZ6-7-jLx41nXj"/>
+      <feature id="org.eclipse.emf.ecore"/>
+      <feature id="org.eclipse.emf.common"/>
+   </features>
+
+   <configurations>
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="1" />
+      <plugin id="org.eclipse.gemini.blueprint.extender" autoStart="true" startLevel="3" />
+   </configurations>
 
 </product>
diff --git a/com.vogella.e4.rcp.blueprintservice/src/com/vogella/e4/rcp/blueprintservice/parts/SamplePart.java b/com.vogella.e4.rcp.blueprintservice/src/com/vogella/e4/rcp/blueprintservice/parts/SamplePart.java
@@ -11,6 +11,8 @@
 package com.vogella.e4.rcp.blueprintservice.parts;
 
 import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
@@ -19,17 +21,21 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
+import com.vogella.e4.rcp.blueprintservice.api.IService;
+
 public class SamplePart {
 
 	private Label label;
 	private TableViewer tableViewer;
+	@Inject
+	IService service;
 
 	@PostConstruct
 	public void createComposite(Composite parent) {
 		parent.setLayout(new GridLayout());
 
 		label = new Label(parent, SWT.NONE);
-		label.setText("Sample table");
+		label.setText(service.getConfig());
 
 		tableViewer = new TableViewer(parent);
 		tableViewer.add("Sample item 1");
diff --git a/com.vogella.e4.rcp.springextender/.project b/com.vogella.e4.rcp.springextender/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.vogella.e4.rcp.springextender</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/com.vogella.e4.rcp.springextender/build.properties b/com.vogella.e4.rcp.springextender/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/com.vogella.e4.rcp.springextender/feature.xml b/com.vogella.e4.rcp.springextender/feature.xml
