Skip to content

Commit 62cbebb

Browse files
jesse-gallagherjesse-gallagher
authored
Merge pull request #315 from OpenNTF/feature/issue-296-containerization
Add initial HTTP-based containerized compilation (Issue #296)
2 parents 2905cbf + 11579b3 commit 62cbebb

File tree

91 files changed

+2768
-283
lines changed

Some content is hidden

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

91 files changed

+2768
-283
lines changed

‎examples/single-nsf/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<plugin>
2323
<groupId>org.openntf.maven</groupId>
2424
<artifactId>nsfodp-maven-plugin</artifactId>
25-
<version>3.11.0-SNAPSHOT</version>
25+
<version>4.0.0-SNAPSHOT</version>
2626
<extensions>true</extensions>
2727
</plugin>
2828
</plugins>

‎examples/xpages-library/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
<plugin>
174174
<groupId>org.openntf.maven</groupId>
175175
<artifactId>nsfodp-maven-plugin</artifactId>
176-
<version>3.11.0-SNAPSHOT</version>
176+
<version>4.0.0-SNAPSHOT</version>
177177
<extensions>true</extensions>
178178
</plugin>
179179

‎nsfodp/bundles/org.openntf.nsfodp.commons.dxl/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.openntf.nsfodp.commons.dxl
55
Automatic-Module-Name: org.openntf.nsfodp.commons.dxl
6-
Bundle-Version: 3.11.0.qualifier
6+
Bundle-Version: 4.0.0.qualifier
77
Bundle-Vendor: %Bundle-Vendor
88
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
9-
Export-Package: org.openntf.nsfodp.commons.dxl;version="3.11.0"
9+
Export-Package: org.openntf.nsfodp.commons.dxl;version="4.0.0"
1010
Require-Bundle: com.ibm.commons;bundle-version="9.0.1",
1111
com.ibm.commons.xml;bundle-version="9.0.1",
1212
org.openntf.nsfodp.commons;bundle-version="2.0.0"

‎nsfodp/bundles/org.openntf.nsfodp.commons.dxl/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.openntf.nsfodp</groupId>
66
<artifactId>nsfodp</artifactId>
7-
<version>3.11.0-SNAPSHOT</version>
7+
<version>4.0.0-SNAPSHOT</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>org.openntf.nsfodp.commons.dxl</artifactId>

‎nsfodp/bundles/org.openntf.nsfodp.commons.odp/META-INF/MANIFEST.MF

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.openntf.nsfodp.commons.odp;singleton:=true
55
Automatic-Module-Name: org.openntf.nsfodp.commons.odp
6-
Bundle-Version: 3.11.0.qualifier
6+
Bundle-Version: 4.0.0.qualifier
77
Bundle-Vendor: %Bundle-Vendor
88
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
99
Require-Bundle: org.eclipse.core.runtime,
@@ -13,6 +13,6 @@ Import-Package: org.openntf.nsfodp.commons;version="3.5.0",
1313
org.openntf.nsfodp.commons.dxl;version="3.5.0",
1414
org.openntf.nsfodp.commons.h;version="3.5.0",
1515
org.openntf.nsfodp.commons.xml;version="3.7.1"
16-
Export-Package: org.openntf.nsfodp.commons.odp;version="3.11.0",
17-
org.openntf.nsfodp.commons.odp.notesapi;version="3.11.0",
18-
org.openntf.nsfodp.commons.odp.util;version="3.11.0"
16+
Export-Package: org.openntf.nsfodp.commons.odp;version="4.0.0",
17+
org.openntf.nsfodp.commons.odp.notesapi;version="4.0.0",
18+
org.openntf.nsfodp.commons.odp.util;version="4.0.0"

‎nsfodp/bundles/org.openntf.nsfodp.commons.odp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.openntf.nsfodp</groupId>
66
<artifactId>nsfodp</artifactId>
7-
<version>3.11.0-SNAPSHOT</version>
7+
<version>4.0.0-SNAPSHOT</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>org.openntf.nsfodp.commons.odp</artifactId>

‎nsfodp/bundles/org.openntf.nsfodp.commons/META-INF/MANIFEST.MF

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.openntf.nsfodp.commons
55
Automatic-Module-Name: org.openntf.nsfodp.commons
6-
Bundle-Version: 3.11.0.qualifier
6+
Bundle-Version: 4.0.0.qualifier
77
Bundle-Vendor: %Bundle-Vendor
88
Export-Package: org.openntf.com.eclipsesource.json;version="0.9.5",
9-
org.openntf.nsfodp.commons;version="3.11.0";uses:="org.eclipse.core.runtime,org.eclipse.osgi.util",
10-
org.openntf.nsfodp.commons.h;version="3.11.0",
11-
org.openntf.nsfodp.commons.io;version="3.11.0";uses:="javax.xml.transform",
12-
org.openntf.nsfodp.commons.jvm;version="3.11.0",
13-
org.openntf.nsfodp.commons.osgi;version="3.11.0";uses:="org.openntf.nsfodp.commons.jvm",
14-
org.openntf.nsfodp.commons.xml;version="3.11.0";uses:="org.w3c.dom,javax.xml.transform"
9+
org.openntf.nsfodp.commons;version="4.0.0";uses:="org.eclipse.core.runtime,org.eclipse.osgi.util",
10+
org.openntf.nsfodp.commons.h;version="4.0.0",
11+
org.openntf.nsfodp.commons.io;version="4.0.0";uses:="javax.xml.transform",
12+
org.openntf.nsfodp.commons.jvm;version="4.0.0",
13+
org.openntf.nsfodp.commons.osgi;version="4.0.0";uses:="org.openntf.nsfodp.commons.jvm",
14+
org.openntf.nsfodp.commons.xml;version="4.0.0";uses:="org.w3c.dom,javax.xml.transform"
1515
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
1616
Require-Bundle: org.eclipse.core.runtime

‎nsfodp/bundles/org.openntf.nsfodp.commons/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.openntf.nsfodp</groupId>
66
<artifactId>nsfodp</artifactId>
7-
<version>3.11.0-SNAPSHOT</version>
7+
<version>4.0.0-SNAPSHOT</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>org.openntf.nsfodp.commons</artifactId>

‎nsfodp/bundles/org.openntf.nsfodp.commons/src/org/openntf/nsfodp/commons/NSFODPConstants.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ public enum NSFODPConstants {
5757
* @since 3.8.0
5858
*/
5959
public static final String HEADER_COMPILE_BASICLS = "X-CompileBasicLS"; //$NON-NLS-1$
60+
/**
61+
* Header indicating the path within the container where the Servlet can expect to find
62+
* the copied package.
63+
* @since 3.11.0
64+
*/
65+
public static final String HEADER_CONTAINER_PACKAGE = "X-ContainerPackage"; //$NON-NLS-1$
6066

6167
/**
6268
* The system property used to specify the path to the ODP directory to compile using the local

‎nsfodp/bundles/org.openntf.nsfodp.compiler.equinox/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.openntf.nsfodp.compiler.equinox;singleton:=true
55
Automatic-Module-Name: org.openntf.nsfodp.compiler.equinox
6-
Bundle-Version: 3.11.0.qualifier
6+
Bundle-Version: 4.0.0.qualifier
77
Bundle-Vendor: %Bundle-Vendor
88
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
99
Fragment-Host: org.openntf.nsfodp.compiler

‎nsfodp/bundles/org.openntf.nsfodp.compiler.equinox/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.openntf.nsfodp</groupId>
66
<artifactId>nsfodp</artifactId>
7-
<version>3.11.0-SNAPSHOT</version>
7+
<version>4.0.0-SNAPSHOT</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>org.openntf.nsfodp.compiler.equinox</artifactId>

‎nsfodp/bundles/org.openntf.nsfodp.compiler.servlet/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.openntf.nsfodp.compiler.servlet;singleton:=true
55
Automatic-Module-Name: org.openntf.nsfodp.compiler.servlet
6-
Bundle-Version: 3.11.0.qualifier
6+
Bundle-Version: 4.0.0.qualifier
77
Bundle-Vendor: %Bundle-Vendor
88
Import-Package: javax.servlet;version="2.5.0",
99
javax.servlet.http;version="2.5.0",

‎nsfodp/bundles/org.openntf.nsfodp.compiler.servlet/fragment.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<extension id="org.openntf.nsfodp.compiler.Servlet" name="odpcompiler" point="org.eclipse.equinox.http.registry.servlets">
2222
<servlet alias="/org.openntf.nsfodp/compiler" class="org.openntf.nsfodp.compiler.servlet.ODPCompilerServlet"/>
2323
</extension>
24+
<extension id="org.openntf.nsfodp.compiler.servlet.ODPCompilerContainerServlet" name="odpcontainercompiler" point="org.eclipse.equinox.http.registry.servlets">
25+
<servlet alias="/org.openntf.nsfodp/containerCompiler" class="org.openntf.nsfodp.compiler.servlet.ODPCompilerContainerServlet"/>
26+
</extension>
2427
<extension id="org.openntf.nsfodp.compiler.StockComponentsServlet" name="stockcomponents" point="org.eclipse.equinox.http.registry.servlets">
2528
<servlet alias="/org.openntf.nsfodp/stockComponents" class="org.openntf.nsfodp.compiler.servlet.StockComponentsServlet"/>
2629
</extension>

‎nsfodp/bundles/org.openntf.nsfodp.compiler.servlet/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.openntf.nsfodp</groupId>
66
<artifactId>nsfodp</artifactId>
7-
<version>3.11.0-SNAPSHOT</version>
7+
<version>4.0.0-SNAPSHOT</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>org.openntf.nsfodp.compiler.servlet</artifactId>

0 commit comments

Comments
 (0)