summaryrefslogtreecommitdiffstats
path: root/branches/sca-equinox/distribution/features/core
diff options
context:
space:
mode:
Diffstat (limited to 'branches/sca-equinox/distribution/features/core')
-rw-r--r--branches/sca-equinox/distribution/features/core/pom.xml7
-rw-r--r--branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml3
-rw-r--r--branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml2
3 files changed, 9 insertions, 3 deletions
diff --git a/branches/sca-equinox/distribution/features/core/pom.xml b/branches/sca-equinox/distribution/features/core/pom.xml
index 53f01acf49..ea5b99be05 100644
--- a/branches/sca-equinox/distribution/features/core/pom.xml
+++ b/branches/sca-equinox/distribution/features/core/pom.xml
@@ -219,6 +219,11 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-security-jsr250</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy-xml</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
@@ -307,7 +312,6 @@
<module>../../../modules/extensibility-equinox</module>
<module>../../../modules/host-corba</module>
<module>../../../modules/host-corba-jse</module>
- <module>../../../modules/host-embedded</module>
<module>../../../modules/host-http</module>
<module>../../../modules/implementation-java</module>
<module>../../../modules/implementation-java-runtime</module>
@@ -329,6 +333,7 @@
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
+ <module>../../../modules/policy-security-jsr250</module>
<module>../../../modules/policy-xml</module>
<module>../../../modules/sca-api</module>
<module>../../../modules/xsd</module>
diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml b/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
index 58d8ca1407..5fb826d7fc 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
+++ b/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
@@ -52,7 +52,6 @@
<exclude>org.apache.tuscany.sca:tuscany-extensibility-equinox</exclude>
<exclude>org.apache.tuscany.sca:tuscany-host-corba</exclude>
<exclude>org.apache.tuscany.sca:tuscany-host-corba-jse</exclude>
- <exclude>org.apache.tuscany.sca:tuscany-host-embedded</exclude>
<exclude>org.apache.tuscany.sca:tuscany-host-http</exclude>
<exclude>org.apache.tuscany.sca:tuscany-implementation-java</exclude>
<exclude>org.apache.tuscany.sca:tuscany-implementation-java-runtime</exclude>
@@ -74,6 +73,7 @@
<exclude>org.apache.tuscany.sca:tuscany-node-launcher-webapp</exclude>
<exclude>org.apache.tuscany.sca:tuscany-policy</exclude>
<exclude>org.apache.tuscany.sca:tuscany-policy-security</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-policy-security-jsr250</exclude>
<exclude>org.apache.tuscany.sca:tuscany-policy-xml</exclude>
<exclude>org.apache.tuscany.sca:tuscany-sca-api</exclude>
<exclude>org.apache.tuscany.sca:tuscany-xsd</exclude>
@@ -88,6 +88,7 @@
<excludes>
<exclude>asm:asm-all</exclude>
<exclude>cglib:cglib-nodep</exclude>
+ <exclude>com.sun:tools</exclude>
<exclude>com.sun.xml.bind:jaxb-impl</exclude>
<exclude>javax.activation:activation</exclude>
<exclude>javax.annotation:jsr250-api</exclude>
diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml
index f3e34d10f3..20cd6c0e4f 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml
+++ b/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml
@@ -49,7 +49,6 @@
<include>extensibility-equinox/**/*</include>
<include>host-corba/**/*</include>
<include>host-corba-jse/**/*</include>
- <include>host-embedded/**/*</include>
<include>host-http/**/*</include>
<include>implementation-java/**/*</include>
<include>implementation-java-runtime/**/*</include>
@@ -71,6 +70,7 @@
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
+ <include>policy-security-jsr250/**/*</include>
<include>policy-xml/**/*</include>
<include>sca-api/**/*</include>
<include>xsd/**/*</include>