Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVioleta Georgieva2016-12-16 21:10:48 +0000
committerVioleta Georgieva2016-12-16 21:10:48 +0000
commitbd2943788f53e737331e691644820faedf540e6a (patch)
treeb8307332a7a7e58c7967bb362b8f9d0908aa156c /build-web-container
parent0355183aecb2467157954d84a24a84b6492918e5 (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-bd2943788f53e737331e691644820faedf540e6a.tar.gz
org.eclipse.gemini.web.gemini-web-container-bd2943788f53e737331e691644820faedf540e6a.tar.xz
org.eclipse.gemini.web.gemini-web-container-bd2943788f53e737331e691644820faedf540e6a.zip
Provide to JASPIC the Tomcat’s implementation for javax.security.auth.message.config.AuthConfigFactory
Diffstat (limited to 'build-web-container')
-rw-r--r--build-web-container/build.xml1
-rwxr-xr-xbuild-web-container/copyToOsgi.sh7
-rwxr-xr-xbuild-web-container/create-feature-xml.xsl2
-rw-r--r--build-web-container/package-ivy.xml1
4 files changed, 8 insertions, 3 deletions
diff --git a/build-web-container/build.xml b/build-web-container/build.xml
index 857cccd..8247fb3 100644
--- a/build-web-container/build.xml
+++ b/build-web-container/build.xml
@@ -5,6 +5,7 @@
<pathelement location="../org.eclipse.gemini.web.core"/>
<pathelement location="../org.eclipse.gemini.web.tomcat"/>
<pathelement location="../org.eclipse.gemini.web.extender"/>
+ <pathelement location="../org.eclipse.gemini.web.jaspic.fragment"/>
</path>
<path id="bundles">
diff --git a/build-web-container/copyToOsgi.sh b/build-web-container/copyToOsgi.sh
index f93961e..cef737d 100755
--- a/build-web-container/copyToOsgi.sh
+++ b/build-web-container/copyToOsgi.sh
@@ -19,9 +19,10 @@ cp $SRC/org.apache.tomcat.jni-8.5.5.jar $REPO/org.apache.tomcat.jni/org.apache.t
cp $SRC/org.apache.tomcat.util-8.5.5.jar $REPO/org.apache.tomcat.util/org.apache.tomcat.util-8.5.5.jar
cp $SRC/org.apache.tomcat.util.scan-8.5.5.jar $REPO/org.apache.tomcat.util.scan/org.apache.tomcat.util.scan-8.5.5.jar
cp $SRC/org.apache.tomcat.websocket-8.5.5.jar $REPO/org.apache.tomcat.websocket/org.apache.tomcat.websocket-8.5.5.jar
-cp $SRC/org.eclipse.gemini.web.core-2.2.1.*.jar $REPO/org.eclipse.gemini.web.core/org.eclipse.gemini.web.core-2.2.1.jar
-cp $SRC/org.eclipse.gemini.web.extender-2.2.1.*.jar $REPO/org.eclipse.gemini.web.extender/org.eclipse.gemini.web.extender-2.2.1.jar
-cp $SRC/org.eclipse.gemini.web.tomcat-2.2.1.*.jar $REPO/org.eclipse.gemini.web.tomcat/org.eclipse.gemini.web.tomcat-2.2.1.jar
+cp $SRC/org.eclipse.gemini.web.core-3.0.0.*.jar $REPO/org.eclipse.gemini.web.core/org.eclipse.gemini.web.core-3.0.0.jar
+cp $SRC/org.eclipse.gemini.web.extender-3.0.0.*.jar $REPO/org.eclipse.gemini.web.extender/org.eclipse.gemini.web.extender-3.0.0.jar
+cp $SRC/org.eclipse.gemini.web.tomcat-3.0.0.*.jar $REPO/org.eclipse.gemini.web.tomcat/org.eclipse.gemini.web.tomcat-3.0.0.jar
+cp $SRC/org.eclipse.gemini.web.jaspic.fragment-3.0.0.*.jar $REPO/org.eclipse.gemini.web.tomcat/org.eclipse.gemini.web.jaspic.fragment-3.0.0.jar
cp $SRC/org.eclipse.jdt.core.compiler.batch-3.10.0.*.jar $REPO/org.eclipse.jdt.core.compiler.batch/org.eclipse.jdt.core.compiler.batch-3.10.0.jar
cp $SRC/org.slf4j.api-1.7.2.*.jar $REPO/org.slf4j.api/org.slf4j.api-1.7.2.jar
cp $SRC/org.slf4j.nop-1.7.2.*.jar $REPO/org.slf4j.nop/org.slf4j.nop-1.7.2.jar
diff --git a/build-web-container/create-feature-xml.xsl b/build-web-container/create-feature-xml.xsl
index 65421ea..f215328 100755
--- a/build-web-container/create-feature-xml.xsl
+++ b/build-web-container/create-feature-xml.xsl
@@ -23,6 +23,8 @@
<plugin id="org.eclipse.gemini.web.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+ <plugin id="org.eclipse.gemini.web.jaspic.fragment" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
<xsl:for-each select="ivy-module/dependencies/dependency">
<plugin>
<xsl:attribute name="id"><xsl:value-of select="@name"/></xsl:attribute>
diff --git a/build-web-container/package-ivy.xml b/build-web-container/package-ivy.xml
index 8056475..8bb698c 100644
--- a/build-web-container/package-ivy.xml
+++ b/build-web-container/package-ivy.xml
@@ -13,6 +13,7 @@
<dependency org="${project.organisation}" name="org.eclipse.gemini.web.core" rev="latest.integration" conf="package->runtime"/>
<dependency org="${project.organisation}" name="org.eclipse.gemini.web.tomcat" rev="latest.integration" conf="package->runtime"/>
<dependency org="${project.organisation}" name="org.eclipse.gemini.web.extender" rev="latest.integration" conf="package->runtime"/>
+ <dependency org="${project.organisation}" name="org.eclipse.gemini.web.jaspic.fragment" rev="latest.integration" conf="package->runtime"/>
</dependencies>
</ivy-module> \ No newline at end of file

Back to the top