Skip to content

Commit

Permalink
New folder jdeeco-concepts added. Here are stored ideas and concepts
Browse files Browse the repository at this point in the history
that would be nice to have but current jDEECo does not allow them to be
coded(well, properly at least). Also project 'parkinglotbooking' was
removed from jdeeco-demos and moved to jdeeco-concepts.
  • Loading branch information
andranikm committed Jan 15, 2014
1 parent 7675a79 commit 9b40e04
Show file tree
Hide file tree
Showing 25 changed files with 5,375 additions and 92 deletions.
8 changes: 8 additions & 0 deletions jdeeco-concepts/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/cz.cuni.mff.d3s.jdeeco.core"/>
<classpathentry kind="lib" path="/cz.cuni.mff.d3s.jdeeco.core/target/cz.cuni.mff.d3s.jdeeco.core-2.0.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions jdeeco-concepts/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin
23 changes: 23 additions & 0 deletions jdeeco-concepts/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>cz.cuni.mff.d3s.jdeeco.concepts</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
221 changes: 221 additions & 0 deletions jdeeco-concepts/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
<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>
<artifactId>cz.cuni.mff.d3s.jdeeco.demo</artifactId>
<version>2.0.0</version>
<packaging>pom</packaging>
<groupId>cz.cuni.mff.d3s.jdeeco</groupId>
<properties>
<dist>../dist</dist>
<cloudJar>cloud.jar</cloudJar>
<convoyJar>convoy.jar</convoyJar>
<convoytutJar>convoytut.jar</convoytutJar>
</properties>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>cloud</id>
<goals>
<goal>jar</goal>
</goals>
<phase>package</phase>
<configuration>
<classifier>cloud</classifier>
<includes>
<include>**/cloud/*</include>
</includes>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<manifestFile>META-INF/CLOUD.MF</manifestFile>
</archive>
</configuration>
</execution>
<execution>
<id>convoy</id>
<goals>
<goal>jar</goal>
</goals>
<phase>package</phase>
<configuration>
<classifier>convoy</classifier>
<includes>
<include>**/convoy/*</include>
</includes>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<manifestFile>META-INF/CONVOY.MF</manifestFile>
</archive>
</configuration>
</execution>
<execution>
<id>convoytut</id>
<goals>
<goal>jar</goal>
</goals>
<phase>package</phase>
<configuration>
<classifier>convoytut</classifier>
<includes>
<include>**/convoytut/*</include>
</includes>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
<manifestFile>META-INF/CONVOYTUT.MF</manifestFile>
</archive>
</configuration>
</execution>
</executions>
</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>
<classifier>cloud</classifier>
<destFileName>${cloudJar}</destFileName>
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>${project.packaging}</type>
<classifier>convoy</classifier>
<destFileName>${convoyJar}</destFileName>
</artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>${project.packaging}</type>
<classifier>convoytut</classifier>
<destFileName>${convoytutJar}</destFileName>
</artifactItem>
</artifactItems>
<overWriteIfNewer>true</overWriteIfNewer>
<outputDirectory>${dist}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>copy-resources</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>install</phase>
<configuration>
<outputDirectory>${dist}</outputDirectory>
<resources>
<resource>
<directory>.</directory>
<includes>
<include>build.xml</include>
<include>site.properties</include>
</includes>
</resource>
</resources>
</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>cz.cuni.mff.d3s</groupId>
<artifactId>cz.cuni.mff.d3s.jini</artifactId>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>cz.cuni.mff.d3s.zip</groupId>
<artifactId>apache-river</artifactId>
<version>2.2.0</version>
<type>zip</type>
</dependency>
</dependencies>
<parent>
<groupId>cz.cuni.mff.d3s.jdeeco</groupId>
<artifactId>cz.cuni.mff.d3s.jdeeco</artifactId>
<relativePath>../jdeeco-parent/pom.xml</relativePath>
<version>2.0.0</version>
</parent>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
******************************************************************************/
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import cz.cuni.mff.d3s.deeco.annotations.Ensemble;
import cz.cuni.mff.d3s.deeco.annotations.KnowledgeExchange;
Expand Down Expand Up @@ -48,8 +48,8 @@ public static boolean membership(
public static void map(
@In("member.request") Request request,
@Out("member.response") ParamHolder<Response> response,
@Out("coord.incomingRequests[member.request.requestId]") ParamHolder<Request> incomingRequest,
@In("coord.processedResponses[member.request.requestId]") Response processedResponse) {
@Out("coord.incomingRequests.[member.request.requestId]") ParamHolder<Request> incomingRequest,
@In("coord.processedResponses.[member.request.requestId]") Response processedResponse) {
incomingRequest.value = request;
if (processedResponse != null)
response.value = processedResponse;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

public class CarId extends ObjectId<String> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import java.util.LinkedList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import java.util.Date;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import java.io.Serializable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import java.util.HashMap;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import java.util.Date;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

public class ParkingPlaceId extends ObjectId<Integer> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import java.io.Serializable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import java.io.Serializable;
import java.util.UUID;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import java.io.Serializable;
import java.util.UUID;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import java.io.Serializable;
import java.util.Date;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cz.cuni.mff.d3s.deeco.demo.parkinglotbooking;
package cz.cuni.mff.d3s.deeco.concepts.parkinglotbooking;

import cz.cuni.mff.d3s.deeco.annotations.processor.AnnotationProcessor;
import cz.cuni.mff.d3s.deeco.annotations.processor.AnnotationProcessorException;
Expand Down
1 change: 1 addition & 0 deletions jdeeco-demo/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/cz.cuni.mff.d3s.jdeeco.core"/>
<classpathentry kind="lib" path="/cz.cuni.mff.d3s.jdeeco.core/target/cz.cuni.mff.d3s.jdeeco.core-2.0.0.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
5 changes: 0 additions & 5 deletions jdeeco-demo/META-INF/CONVOY.MF

This file was deleted.

5 changes: 0 additions & 5 deletions jdeeco-demo/META-INF/CONVOYTUT.MF

This file was deleted.

17 changes: 0 additions & 17 deletions jdeeco-demo/jpfProperties/LocalLauncherCloudJPF.jpf

This file was deleted.

Loading

0 comments on commit 9b40e04

Please sign in to comment.