diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-10-09 19:18:17 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-10-09 19:34:35 +0300 |
| commit | 88a2702f4769f627216d4734a0debbd38b44975a (patch) | |
| tree | 6991055206df04953f4d12ea3aacb1dce0db9aa0 | |
| parent | 117c2ef96575b1a6e0b94a036940a704250afca6 (diff) | |
| download | vaadin-framework-88a2702f4769f627216d4734a0debbd38b44975a.tar.gz vaadin-framework-88a2702f4769f627216d4734a0debbd38b44975a.zip | |
Explicitly specify symbolic names for each bundle to prevent names like "com.vaadin.vaadin-shared" (#9793)
Change-Id: I329e4d6b8334864be5023ef51225a6e340e74aa6
| -rw-r--r-- | buildhelpers/build.xml | 1 | ||||
| -rw-r--r-- | client-compiled/build.xml | 3 | ||||
| -rw-r--r-- | client-compiler/build.xml | 1 | ||||
| -rw-r--r-- | client/build.xml | 1 | ||||
| -rw-r--r-- | common.xml | 1 | ||||
| -rw-r--r-- | server/build.xml | 5 | ||||
| -rw-r--r-- | theme-compiler/build.xml | 1 | ||||
| -rw-r--r-- | themes/build.xml | 3 |
8 files changed, 11 insertions, 5 deletions
diff --git a/buildhelpers/build.xml b/buildhelpers/build.xml index 80797415e5..d50e024ce4 100644 --- a/buildhelpers/build.xml +++ b/buildhelpers/build.xml @@ -8,6 +8,7 @@ <include file="../common.xml" as="common" /> <property name="module.name" value="vaadin-buildhelpers" /> + <property name="module.symbolic" value="com.vaadin.buildhelpers" /> <property name="result.dir" location="result" /> <path id="classpath.compile.custom" /> diff --git a/client-compiled/build.xml b/client-compiled/build.xml index f75a27ffcd..8b2e76e183 100644 --- a/client-compiled/build.xml +++ b/client-compiled/build.xml @@ -11,6 +11,7 @@ <!-- global properties --> <property name="module.name" value="vaadin-client-compiled" /> + <property name="module.symbolic" value="com.vaadin.client-compiled" /> <property name="result.dir" value="result" /> <property name="gwtar.dir" location="${result.dir}/gwtar" /> <property name="work.dir" location="${result.dir}/work" /> @@ -127,4 +128,4 @@ <echo>WHAT? No tests for ${module.name}!</echo> </target> -</project>
\ No newline at end of file +</project> diff --git a/client-compiler/build.xml b/client-compiler/build.xml index 733ee73e32..95544708c1 100644 --- a/client-compiler/build.xml +++ b/client-compiler/build.xml @@ -10,6 +10,7 @@ <!-- global properties --> <property name="module.name" value="vaadin-client-compiler" /> + <property name="module.symbolic" value="com.vaadin.client-compiler" /> <property name="result.dir" value="result" /> <path id="classpath.compile.custom"> <fileset file="${gwt.dev.jar}" /> diff --git a/client/build.xml b/client/build.xml index 03c9c91401..26f92ee33f 100644 --- a/client/build.xml +++ b/client/build.xml @@ -10,6 +10,7 @@ <!-- global properties --> <property name="module.name" value="vaadin-client" /> + <property name="module.symbolic" value="com.vaadin.client" /> <property name="result.dir" value="result" /> <path id="classpath.compile.custom"> diff --git a/common.xml b/common.xml index 15f4891c12..0b2d82e2a2 100644 --- a/common.xml +++ b/common.xml @@ -156,7 +156,6 @@ <fail unless="module.name" message="No module.name parameter given" /> <property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" /> - <property name="module.symbolic" value="com.vaadin.${module.name}" /> <property name="classes" location="{$result.dir}/classes" /> <property name="src" location="{$result.dir}/../src" /> diff --git a/server/build.xml b/server/build.xml index a987ec3846..ba2f60f4c9 100644 --- a/server/build.xml +++ b/server/build.xml @@ -10,6 +10,7 @@ <!-- global properties --> <property name="module.name" value="vaadin-server" /> + <property name="module.symbolic" value="com.vaadin.server" /> <property name="result.dir" value="result" /> <path id="classpath.compile.custom" /> <path id="classpath.tests.custom" /> @@ -24,7 +25,7 @@ <target name="jar"> <property name="server.osgi.import" value="javax.servlet;version="2.4.0",javax.servlet.http;version="2.4.0",org.jsoup;version="1.6.3""/> <antcall target="common.jar"> - <param name="require-bundle" value="com.vaadin.vaadin-shared;bundle-version="${vaadin.version}""/> + <param name="require-bundle" value="com.vaadin.shared;bundle-version="${vaadin.version}""/> <param name="import-package" value="${server.osgi.import}" /> <reference torefid="extra.jar.includes" refid="jar.includes" /> </antcall> @@ -46,4 +47,4 @@ </target> -</project>
\ No newline at end of file +</project> diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml index 8a36513b71..86c73d1499 100644 --- a/theme-compiler/build.xml +++ b/theme-compiler/build.xml @@ -10,6 +10,7 @@ <!-- global properties --> <property name="module.name" value="vaadin-theme-compiler" /> + <property name="module.symbolic" value="com.vaadin.theme-compiler" /> <property name="result.dir" value="result" /> <path id="classpath.compile.custom"> </path> diff --git a/themes/build.xml b/themes/build.xml index 83675867ad..11a4e59184 100644 --- a/themes/build.xml +++ b/themes/build.xml @@ -11,6 +11,7 @@ <!-- global properties --> <property name="module.name" value="vaadin-themes" /> + <property name="module.symbolic" value="com.vaadin.themes" /> <property name="result.dir" value="result" /> <property name="theme.result.dir" value="${result.dir}/VAADIN/themes" /> @@ -99,4 +100,4 @@ <echo>WHAT? No tests for ${module.name}!</echo> </target> -</project>
\ No newline at end of file +</project> |