Skip to content

Commit e3bac3d

Browse files
pete-gilchristpete-gilchrist
authored
Merge pull request #23 from OpenAS2/dev
Release 2.2.0
2 parents 700ed28 + 93e1715 commit e3bac3d

File tree

255 files changed

+1685
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+1685
-213
lines changed

‎.classpath

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="Remote/src"/>
4-
<classpathentry kind="src" path="Server/src"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
3+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
4+
<classpathentry kind="src" path="Server/src/main/java"/>
5+
<classpathentry kind="src" path="Remote/src/main/java"/>
6+
<classpathentry kind="src" path="Bundle/src/main/java"/>
7+
<classpathentry exported="true" kind="lib" path="Server/lib/commons-lang3-3.4.jar"/>
8+
<classpathentry exported="true" kind="lib" path="Server/lib/commons-logging-1.2.jar"/>
9+
<classpathentry exported="true" kind="lib" path="Server/lib/javax.mail.jar"/>
10+
<classpathentry exported="true" kind="lib" path="Server/lib/bcmail-jdk15on-154.jar"/>
11+
<classpathentry exported="true" kind="lib" path="Server/lib/bcpg-jdk15on-154.jar"/>
12+
<classpathentry exported="true" kind="lib" path="Server/lib/bcpkix-jdk15on-154.jar"/>
13+
<classpathentry exported="true" kind="lib" path="Server/lib/bcprov-jdk15on-154.jar"/>
14+
<classpathentry exported="true" kind="lib" path="Server/lib/h2-1.4.192.jar"/>
15+
<classpathentry exported="true" kind="lib" path="Server/lib/dom4j-2.0.0.jar"/>
616
<classpathentry kind="lib" path="Remote/lib/servlet.jar"/>
7-
<classpathentry kind="lib" path="Server/lib/commons-lang3-3.4.jar"/>
8-
<classpathentry kind="lib" path="Server/lib/commons-logging-1.2.jar"/>
9-
<classpathentry kind="lib" path="Server/lib/dom4j-1.6.1.jar"/>
10-
<classpathentry kind="lib" path="Server/lib/javax.mail.jar"/>
11-
<classpathentry kind="lib" path="Server/lib/bcmail-jdk15on-154.jar"/>
12-
<classpathentry kind="lib" path="Server/lib/bcpg-jdk15on-154.jar"/>
13-
<classpathentry kind="lib" path="Server/lib/bcpkix-jdk15on-154.jar"/>
14-
<classpathentry kind="lib" path="Server/lib/bcprov-jdk15on-154.jar"/>
17+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
1518
<classpathentry kind="output" path="classes"/>
1619
</classpath>

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/bin/
2+
/classes/
3+
/tests/

‎.project

+17
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,25 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.pde.ManifestBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.pde.SchemaBuilder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
1328
</buildSpec>
1429
<natures>
30+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
1531
<nature>org.eclipse.jdt.core.javanature</nature>
32+
<nature>org.eclipse.pde.PluginNature</nature>
1633
</natures>
1734
</projectDescription>

‎Bundle/.classpath

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
20+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
21+
<attributes>
22+
<attribute name="maven.pomderived" value="true"/>
23+
</attributes>
24+
</classpathentry>
25+
<classpathentry kind="output" path="target/classes"/>
26+
</classpath>

‎Bundle/.project

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>Bundle</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
22+
</natures>
23+
</projectDescription>

‎Bundle/pom.xml

+138
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<parent>
4+
<groupId>org.openas2</groupId>
5+
<artifactId>OpenAS2</artifactId>
6+
<version>2.2.0</version>
7+
</parent>
8+
<modelVersion>4.0.0</modelVersion>
9+
<groupId>org.openas2</groupId>
10+
<artifactId>openas2-osgi</artifactId>
11+
<version>2.2.0</version>
12+
<name>OpenAS2 OSGi Server</name>
13+
<url>https://sourceforge.net/projects/openas2</url>
14+
<description>Open source implementation of the AS2 standard for signed encrypted and compressed document transfer</description>
15+
<properties>
16+
<project.dist.package.name>${project.parent.artifactId}ServerOSGi-${project.version}.zip</project.dist.package.name>
17+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18+
<lib.dir>${basedir}/lib</lib.dir>
19+
<help.filename>OpenAS2HowTo.pdf</help.filename>
20+
<help.file.src>../docs/${help.filename}</help.file.src>
21+
<dist.dir>dist</dist.dir>
22+
</properties>
23+
<build>
24+
<sourceDirectory>src/main/java</sourceDirectory>
25+
<directory>target</directory>
26+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
27+
<!-- <finalName>${project.artifactId}-${project.version}</finalName> -->
28+
<finalName>${project.artifactId}</finalName>
29+
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
30+
<scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
31+
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
32+
33+
<plugins>
34+
<plugin>
35+
<artifactId>maven-antrun-plugin</artifactId>
36+
<version>1.8</version>
37+
<executions>
38+
<execution>
39+
<id>default-cli</id>
40+
<goals>
41+
<goal>run</goal>
42+
</goals>
43+
<phase>package</phase>
44+
<configuration>
45+
<target>
46+
<delete file="${lib.dir}/${project.build.finalName}.jar" />
47+
<copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${lib.dir}" />
48+
49+
<!-- Create the distribution directory -->
50+
<mkdir dir="${dist.dir}" />
51+
<!-- Add the help PDF version to the distro -->
52+
<copy file="${help.file.src}" todir="${basedir}" />
53+
<!-- create distribution package -->
54+
<zip destfile="${dist.dir}/${project.dist.package.name}"
55+
basedir="." excludes="dist/**,temp/**,logs/**,data/**,target/**" />
56+
<!-- Remove the copied help file -->
57+
<delete file="${help.filename}" />
58+
59+
</target>
60+
</configuration>
61+
</execution>
62+
</executions>
63+
64+
</plugin>
65+
<plugin>
66+
<artifactId>maven-compiler-plugin</artifactId>
67+
<version>3.1</version>
68+
<configuration>
69+
<source>1.5</source>
70+
<target>1.5</target>
71+
</configuration>
72+
</plugin>
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-jar-plugin</artifactId>
76+
<version>3.0.2</version>
77+
<configuration>
78+
<archive>
79+
<index>true</index>
80+
<manifest>
81+
<addClasspath>true</addClasspath>
82+
<mainClass>org.openas2.osgi.Activator</mainClass>
83+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
84+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
85+
</manifest>
86+
</archive>
87+
</configuration>
88+
</plugin>
89+
</plugins>
90+
</build>
91+
<dependencies>
92+
<dependency>
93+
<groupId>org.dom4j</groupId>
94+
<artifactId>dom4j</artifactId>
95+
<version>2.0.0</version>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.bouncycastle</groupId>
99+
<artifactId>bcmail-jdk15on</artifactId>
100+
<version>1.54</version>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.bouncycastle</groupId>
104+
<artifactId>bcpkix-jdk15on</artifactId>
105+
<version>1.54</version>
106+
</dependency>
107+
<dependency>
108+
<groupId>org.bouncycastle</groupId>
109+
<artifactId>bcprov-jdk15on</artifactId>
110+
<version>1.54</version>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.apache.commons</groupId>
114+
<artifactId>commons-lang3</artifactId>
115+
<version>3.4</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>commons-logging</groupId>
119+
<artifactId>commons-logging</artifactId>
120+
<version>1.2</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>javax.mail</groupId>
124+
<artifactId>mail</artifactId>
125+
<version>1.4.7</version>
126+
</dependency>
127+
<dependency>
128+
<groupId>com.h2database</groupId>
129+
<artifactId>h2</artifactId>
130+
<version>1.4.193</version>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.bouncycastle</groupId>
134+
<artifactId>bcpg-jdk15on</artifactId>
135+
<version>1.54</version>
136+
</dependency>
137+
</dependencies>
138+
</project>

‎Bundle/src/main/java/org/openas2/osgi/Activator.java

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package org.openas2.osgi;
2+
3+
import org.openas2.app.OpenAS2Server;
4+
import org.osgi.framework.BundleActivator;
5+
import org.osgi.framework.BundleContext;
6+
import org.osgi.framework.ServiceRegistration;
7+
8+
public class Activator implements BundleActivator {
9+
10+
private static BundleContext context;
11+
private ServiceRegistration<?> openAS2Registration;
12+
13+
static BundleContext getContext() {
14+
return context;
15+
}
16+
17+
/*
18+
* (non-Javadoc)
19+
* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
20+
*/
21+
public void start(BundleContext bundleContext) throws Exception {
22+
Activator.context = bundleContext;
23+
OpenAS2Server openAS2Service = new OpenAS2Server();
24+
openAS2Registration = bundleContext.registerService(OpenAS2Server.class.getName(), openAS2Service, null);
25+
openAS2Service.start(null);
26+
}
27+
28+
/*
29+
* (non-Javadoc)
30+
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
31+
*/
32+
public void stop(BundleContext bundleContext) throws Exception {
33+
openAS2Registration.unregister();
34+
Activator.context = null;
35+
}
36+
37+
}

0 commit comments

Comments
 (0)