OSGi added, poms modified

jdeeco-core-osgi/pom.xml

@@ -0,0 +1,158 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+        <modelVersion>4.0.0</modelVersion>
+        <parent>
+                <groupId>cz.cuni.mff.d3s.jdeeco</groupId>
+                <artifactId>cz.cuni.mff.d3s.jdeeco</artifactId>
+                <version>2.0.0</version>
+                <relativePath>../jdeeco-parent/pom.xml</relativePath>
+        </parent>
+        <artifactId>cz.cuni.mff.d3s.jdeeco.core-osgi</artifactId>
+        <packaging>bundle</packaging>
+        <build>
+                <sourceDirectory>../jdeeco-core/src</sourceDirectory>
+                <!-- testSourceDirectory>test</testSourceDirectory -->
+                <resources>
+                        <resource>
+                                <directory>../jdeeco-core/src</directory>
+                                <excludes>
+                                        <exclude>**/*.java</exclude>
+                                </excludes>
+                        </resource>
+                        <resource>
+                                <directory>../jdeeco-core/src/..</directory>
+                                <includes>
+                                        <include>OSGI-INF/*.*</include>
+                                </includes>
+                        </resource>
+                </resources>
+                <plugins>
+                        <plugin>
+                                <groupId>org.apache.felix</groupId>
+                                <artifactId>maven-bundle-plugin</artifactId>
+                                <extensions>true</extensions>
+                                <configuration>
+                                        <instructions>
+                                                <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                                                <Bundle-Name>jDEECo Core</Bundle-Name>
+                                                <Bundle-SymbolicName>cz.cuni.mff.d3s.jdeeco.core</Bundle-SymbolicName>
+                                                <Service-Component>OSGI-INF/*.xml</Service-Component>
+                                                <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+                                                <Export-Package>cz.cuni.mff.d3s.deeco.annotations,cz.cuni.mff.d3s.deeco.ensemble,cz.cuni.mff.d3s.deeco.invokable,cz.cuni.mff.d3s.deeco.knowledge,cz.cuni.mff.d3s.deeco.knowledge.jini,cz.cuni.mff.d3s.deeco.knowledge.local,cz.cuni.mff.d3s.deeco.processor,cz.cuni.mff.d3s.deeco.provider,cz.cuni.mff.d3s.deeco.runtime,cz.cuni.mff.d3s.deeco.scheduling</Export-Package>
+                                        </instructions>
+                                </configuration>
+                        </plugin>
+                        <plugin>
+                                <groupId>org.apache.maven.plugins</groupId>
+                                <artifactId>maven-dependency-plugin</artifactId>
+                                <version>2.6</version>
+                                <executions>
+                                        <execution>
+                                                <id>copy</id>
+                                                <phase>install</phase>
+                                                <goals>
+                                                        <goal>copy</goal>
+                                                </goals>
+                                                <configuration>
+                                                        <artifactItems>
+                                                                <artifactItem>
+                                                                        <groupId>${project.groupId}</groupId>
+                                                                        <artifactId>${project.artifactId}</artifactId>
+                                                                        <version>${project.version}</version>
+                                                                        <type>${project.packaging}</type>
+                                                                </artifactItem>
+                                                        </artifactItems>
+                                                        <outputDirectory>../dist</outputDirectory>
+                                                </configuration>
+                                        </execution>
+                                </executions>
+                        </plugin>
+                        <plugin>
+                                <artifactId>maven-clean-plugin</artifactId>
+                                <version>2.5</version>
+                                <executions>
+                                        <execution>
+                                                <id>clean-dist</id>
+                                                <goals>
+                                                        <goal>clean</goal>
+                                                </goals>
+                                                <phase>clean</phase>
+                                                <configuration>
+                                                        <skip>true</skip>
+                                                </configuration>
+                                        </execution>
+                                </executions>
+                        </plugin>
+                </plugins>
+                <pluginManagement>
+                        <plugins>
+                                <!-- Ignore/Execute plugin execution -->
+                                <plugin>
+                                        <groupId>org.eclipse.m2e</groupId>
+                                        <artifactId>lifecycle-mapping</artifactId>
+                                        <version>1.0.0</version>
+                                        <configuration>
+                                                <lifecycleMappingMetadata>
+                                                        <pluginExecutions>
+                                                                <!-- copy-dependency plugin -->
+                                                                <pluginExecution>
+                                                                        <pluginExecutionFilter>
+                                                                                <groupId>org.apache.maven.plugins</groupId>
+                                                                                <artifactId>maven-dependency-plugin</artifactId>
+                                                                                <versionRange>[1.0.0,)</versionRange>
+                                                                                <goals>
+                                                                                        <goal>unpack</goal>
+                                                                                </goals>
+                                                                        </pluginExecutionFilter>
+                                                                        <action>
+                                                                                <ignore />
+                                                                        </action>
+                                                                </pluginExecution>
+                                                        </pluginExecutions>
+                                                </lifecycleMappingMetadata>
+                                        </configuration>
+                                </plugin>
+                        </plugins>
+                </pluginManagement>
+        </build>
+        <dependencies>
+                <!-- dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> 
+                        <version>6.5.1</version> </dependency -->
+                <dependency>
+                        <groupId>cz.cuni.mff.d3s</groupId>
+                        <artifactId>cz.cuni.mff.d3s.bcel</artifactId>
+                        <version>1.0.0</version>
+                        <scope>provided</scope>
+                </dependency>
+                <dependency>
+                        <groupId>cz.cuni.mff.d3s</groupId>
+                        <artifactId>cz.cuni.mff.d3s.jini</artifactId>
+                        <version>1.0.0</version>
+                        <scope>provided</scope>
+                </dependency>
+				<dependency>
+					<groupId>org.eclipse.emf</groupId>
+					<artifactId>org.eclipse.emf.ecore</artifactId>
+					<version>2.9.0-v20130528-0742</version>
+					<scope>compile</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.eclipse.emf</groupId>
+					<artifactId>org.eclipse.emf.common</artifactId>
+					<version>2.9.0-v20130528-0742</version>
+					<scope>compile</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.eclipse.emf</groupId>
+					<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
+					<version>2.9.0-v20130528-0742</version>
+					<scope>compile</scope>
+				</dependency>
+				<dependency>
+					<groupId>uk.com.robust-it</groupId>
+					<artifactId>cloning</artifactId>
+					<version>1.9.0</version>
+					<scope>compile</scope>
+				</dependency>
+        </dependencies>
+</project>

jdeeco-core-osgi/target/classes/META-INF/MANIFEST.MF

@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bnd-LastModified: 1389374322283
+Build-Jdk: 1.7.0_45
+Built-By: Spectrum
+Bundle-ActivationPolicy: lazy
+Bundle-ManifestVersion: 2
+Bundle-Name: jDEECo Core
+Bundle-SymbolicName: cz.cuni.mff.d3s.jdeeco.core
+Bundle-Version: 2.0.0
+Created-By: Apache Maven Bundle Plugin
+Export-Package: cz.cuni.mff.d3s.deeco.annotations;version="2.0.0",cz.cun
+ i.mff.d3s.deeco.knowledge;version="2.0.0",cz.cuni.mff.d3s.deeco.runtime
+ ;uses:="cz.cuni.mff.d3s.deeco.knowledge,org.eclipse.emf.common.notify";
+ version="2.0.0",cz.cuni.mff.d3s.deeco.processor;version="2.0.0",cz.cuni
+ .mff.d3s.deeco.invokable;version="2.0.0",cz.cuni.mff.d3s.deeco.scheduli
+ ng;version="2.0.0",cz.cuni.mff.d3s.deeco.knowledge.jini;version="2.0.0"
+ ,cz.cuni.mff.d3s.deeco.knowledge.local;version="2.0.0",cz.cuni.mff.d3s.
+ deeco.provider;version="2.0.0",cz.cuni.mff.d3s.deeco.ensemble;version="
+ 2.0.0"
+Import-Package: com.rits.cloning;version="[1.9,2)",cz.cuni.mff.d3s.deeco
+ .annotations,org.eclipse.emf.common.notify,org.eclipse.emf.common.notif
+ y.impl,org.eclipse.emf.common.util,org.eclipse.emf.ecore,org.eclipse.em
+ f.ecore.impl,org.eclipse.emf.ecore.plugin,org.eclipse.emf.ecore.resourc
+ e,org.eclipse.emf.ecore.util
+Service-Component: OSGI-INF/*.xml
+Tool: Bnd-2.1.0.20130426-122213

jdeeco-core-osgi/target/classes/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.jj

@@ -0,0 +1,117 @@
+ /* Copyright (c) 2006, Sun Microsystems, Inc.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the Sun Microsystems, Inc. nor the names of its
+ *       contributors may be used to endorse or promote products derived from
+ *       this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+options {
+  STATIC = false;
+}
+
+PARSER_BEGIN(PathParser)
+package cz.cuni.mff.d3s.deeco.path.grammar;
+import cz.cuni.mff.d3s.deeco.path.grammar.PNode;
+import java.io.ByteArrayInputStream;
+
+/** Simple brace matcher. */
+public class PathParser
+{
+  /** Main entry point. */
+  public static PNode parse(String expression) throws ParseException
+  {
+    PathParser parser = new PathParser(new ByteArrayInputStream(expression.getBytes()));
+    return parser.parseExpression();
+  }
+}
+
+PARSER_END(PathParser)
+
+TOKEN [ IGNORE_CASE ] :
+{
+  < COORD : "coord" >
+| < MEMBER : "member" >
+}
+
+TOKEN :
+{
+  < IDENTIFIER :
+    (
+      < LETTER >
+    | < DIGIT >
+    )+ >
+| < #LETTER : [ "_", "-", "a"-"z", "A"-"Z" ] >
+| < #DIGIT : [ "0"-"9" ] >
+| < SEPARATOR : [ "." ] >
+| < OPEN : [ "[" ] >
+| < CLOSE : [ "]" ] >
+}
+
+PNode parseExpression() :
+{
+  Token t;
+  // Values needed to create a PNode
+  Object value = null; //May be String or PNode or EEnsembleParty
+  PNode next = null;
+
+}
+{
+  (
+    (t = < IDENTIFIER >
+    {
+      value = t.image;
+    }
+    )
+  | (t = < COORD >
+    {
+      value = EEnsembleParty.COORDINATOR;
+    }
+    )
+  | (t = < MEMBER >
+    {
+      value = EEnsembleParty.MEMBER;
+    }
+    )
+  |
+    (
+      (
+        < OPEN >
+        {
+          value = parseExpression();
+          next = null;
+        }
+      )
+      < CLOSE >
+    )
+  )
+  (
+    < SEPARATOR >
+    {
+      next = parseExpression();
+    }
+  )*
+  {
+    return new PNode(value, next);
+  }
+}

jdeeco-core-osgi/target/classes/cz/cuni/mff/d3s/deeco/scheduler/.gitignore

@@ -0,0 +1 @@
+/LocalTimeScheduler.java