Permalink
Browse files

372640 373496 Removing the start folder and updating the build and do…

…cs to reflect this. Also fixing the build to run from a clean m2 repo.
  • Loading branch information...
1 parent 2d8d3e3 commit 92438523739be1de1b3a86a03186f544accc3a76 Christopher Frost committed Mar 12, 2012
Showing with 131 additions and 2,189 deletions.
  1. BIN .DS_Store
  2. +40 −4 build-greenpages/build.xml
  3. +0 −39 build-greenpages/package-top-level.xml
  4. 0 {solution/greenpages.app → greenpages.core}/.classpath
  5. 0 {solution/greenpages.app → greenpages.core}/.project
  6. 0 {solution/greenpages.app → greenpages.core}/.settings/org.eclipse.jdt.core.prefs
  7. 0 {solution/greenpages.app → greenpages.core}/.settings/org.eclipse.m2e.core.prefs
  8. 0 {solution/greenpages.app → greenpages.core}/.settings/org.eclipse.wst.common.component
  9. 0 {solution/greenpages.app → greenpages.core}/.settings/org.eclipse.wst.common.project.facet.core.xml
  10. 0 {solution/greenpages.app → greenpages.core}/.settings/org.maven.ide.eclipse.prefs
  11. 0 {solution/greenpages.app → greenpages.core}/.springBeans
  12. +8 −4 {start/greenpages.app → greenpages.core}/pom.xml
  13. 0 {solution/greenpages.app → greenpages.core}/src/main/java/greenpages/Directory.java
  14. 0 {solution/greenpages.app → greenpages.core}/src/main/java/greenpages/Listing.java
  15. 0 {solution/greenpages.app → greenpages.core}/src/main/java/greenpages/internal/DirectoryImpl.java
  16. 0 {solution/greenpages.app → greenpages.core}/src/main/java/greenpages/internal/ImmutableListing.java
  17. 0 {solution/greenpages.app → greenpages.core}/src/main/resources/META-INF/MANIFEST.MF
  18. 0 {solution/greenpages.app → greenpages.core}/src/main/resources/META-INF/spring/module-context.xml
  19. 0 {solution/greenpages.app → greenpages.core}/src/main/resources/META-INF/spring/osgi-context.xml
  20. +2 −2 {solution/greenpages.app → greenpages.core}/template.mf
  21. 0 {solution → }/greenpages.db/.classpath
  22. 0 {solution → }/greenpages.db/.project
  23. 0 {solution → }/greenpages.db/.settings/org.eclipse.jdt.core.prefs
  24. 0 {solution → }/greenpages.db/.settings/org.eclipse.m2e.core.prefs
  25. 0 {solution → }/greenpages.db/.settings/org.eclipse.wst.common.project.facet.core.xml
  26. 0 {solution → }/greenpages.db/.springBeans
  27. +9 −5 {solution → }/greenpages.db/pom.xml
  28. 0 {solution → }/greenpages.db/src/main/resources/META-INF/MANIFEST.MF
  29. 0 {solution → }/greenpages.db/src/main/resources/META-INF/spring/module-context.xml
  30. 0 {solution → }/greenpages.db/src/main/resources/META-INF/spring/osgi-context.xml
  31. 0 {solution → }/greenpages.db/template.mf
  32. 0 {solution → }/greenpages.jpa/.classpath
  33. 0 {solution → }/greenpages.jpa/.project
  34. 0 {solution → }/greenpages.jpa/.settings/JpaDirectorySpringContextTests-solution.launch
  35. 0 {solution → }/greenpages.jpa/.settings/org.eclipse.jdt.core.prefs
  36. 0 {solution → }/greenpages.jpa/.settings/org.eclipse.jst.common.project.facet.core.prefs
  37. 0 {solution → }/greenpages.jpa/.settings/org.eclipse.m2e.core.prefs
  38. 0 {solution → }/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
  39. 0 {solution → }/greenpages.jpa/.settings/org.maven.ide.eclipse.prefs
  40. 0 {solution → }/greenpages.jpa/.springBeans
  41. +8 −8 {solution → }/greenpages.jpa/pom.xml
  42. 0 {solution → }/greenpages.jpa/src/main/java/greenpages/jpa/JpaDirectory.java
  43. 0 {solution → }/greenpages.jpa/src/main/java/greenpages/jpa/JpaListing.java
  44. 0 {solution → }/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
  45. 0 {solution → }/greenpages.jpa/src/main/resources/META-INF/orm.xml
  46. 0 {solution → }/greenpages.jpa/src/main/resources/META-INF/persistence.xml
  47. 0 {solution → }/greenpages.jpa/src/main/resources/META-INF/spring/module-context.xml
  48. 0 {solution → }/greenpages.jpa/src/main/resources/META-INF/spring/osgi-context.xml
  49. 0 {solution → }/greenpages.jpa/src/test/java/greenpages/jpa/JpaDirectorySpringContextTests.java
  50. 0 {solution → }/greenpages.jpa/src/test/java/greenpages/jpa/TestDataPopulator.java
  51. 0 {solution → }/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml
  52. +3 −3 {solution → }/greenpages.jpa/template.mf
  53. 0 {solution/parent → greenpages.parent}/.classpath
  54. 0 {solution/parent → greenpages.parent}/.project
  55. 0 {solution/parent → greenpages.parent}/.settings/org.eclipse.m2e.core.prefs
  56. 0 {solution/parent → greenpages.parent}/.settings/org.maven.ide.eclipse.prefs
  57. +13 −11 {solution/parent → greenpages.parent}/pom.xml
  58. 0 {solution → }/greenpages.web/.classpath
  59. 0 {solution → }/greenpages.web/.project
  60. 0 {solution → }/greenpages.web/.settings/.jsdtscope
  61. 0 {solution → }/greenpages.web/.settings/GreenPagesSpringContextTests-solution.launch
  62. 0 {solution → }/greenpages.web/.settings/org.eclipse.jdt.core.prefs
  63. 0 {solution → }/greenpages.web/.settings/org.eclipse.m2e.core.prefs
  64. 0 {solution → }/greenpages.web/.settings/org.eclipse.wst.common.component
  65. 0 {solution → }/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
  66. 0 {solution → }/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
  67. 0 {solution → }/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
  68. 0 {solution → }/greenpages.web/.settings/org.maven.ide.eclipse.prefs
  69. 0 {solution → }/greenpages.web/.settings/org.springframework.ide.eclipse.beans.core.prefs
  70. 0 {solution → }/greenpages.web/.springBeans
  71. +8 −9 {solution → }/greenpages.web/pom.xml
  72. 0 {solution → }/greenpages.web/src/main/java/greenpages/web/GreenPagesController.java
  73. 0 {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/META-INF/MANIFEST.MF
  74. 0 ...reenpages.web/src/main/webapp → greenpages.web/src/main/resources}/WEB-INF/applicationContext.xml
  75. 0 {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/WEB-INF/ftl/entry.ftl
  76. 0 {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/WEB-INF/ftl/home.ftl
  77. 0 {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/WEB-INF/ftl/search.ftl
  78. 0 ...reenpages.web/src/main/webapp → greenpages.web/src/main/resources}/WEB-INF/greenpages-servlet.xml
  79. 0 {start/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/WEB-INF/web.xml
  80. BIN {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/favicon.ico
  81. BIN {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/footer-left.png
  82. BIN ...ution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/footer-right.png
  83. BIN ...ion/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/footer-stretch.png
  84. BIN {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/header-left.png
  85. BIN ...ution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/header-right.png
  86. BIN ...greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/loader-white-large.gif
  87. BIN ...greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/loader-white-small.gif
  88. BIN ...on/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/menu-curve-left.png
  89. BIN ...n/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/menu-curve-right.png
  90. BIN ...ution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/menu-stretch.png
  91. BIN ...n/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/mini-header-left.png
  92. BIN .../greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/mini-header-right.png
  93. BIN ...tion/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/s2ap_soda_can.png
  94. BIN {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/images/spring.png
  95. BIN ...pages.web/src/main/webapp → greenpages.web/src/main/resources}/images/table-header-background.png
  96. 0 {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/index.html
  97. 0 {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/styles/local.css
  98. 0 {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/styles/main.css
  99. 0 {solution/greenpages.web/src/main/webapp → greenpages.web/src/main/resources}/styles/print.css
  100. 0 {solution → }/greenpages.web/src/test/java/greenpages/web/GreenPagesSpringContextTests.java
  101. 0 {solution → }/greenpages.web/src/test/java/greenpages/web/TestDataPopulator.java
  102. 0 {solution → }/greenpages.web/src/test/resources/META-INF/spring/test-context.xml
  103. +2 −2 {solution → }/greenpages.web/template.mf
  104. 0 {solution → }/greenpages/.classpath
  105. 0 {solution → }/greenpages/.project
  106. 0 {solution → }/greenpages/.settings/org.eclipse.jdt.core.prefs
  107. 0 {solution → }/greenpages/.settings/org.eclipse.m2e.core.prefs
  108. 0 {solution → }/greenpages/.settings/org.eclipse.virgo.ide.runtime.core.par.xml
  109. 0 {solution → }/greenpages/.settings/org.eclipse.wst.common.project.facet.core.xml
  110. 0 {solution → }/greenpages/.settings/org.maven.ide.eclipse.prefs
  111. 0 {solution → }/greenpages/META-INF/MANIFEST.MF
  112. +8 −9 {solution → }/greenpages/pom.xml
  113. 0 {start/greenpages.web/src/main/java/greenpages/web → greenpages/src/main/resources}/.gitignore
  114. +2 −0 greenpages/template.mf
  115. +1 −1 guide/filters.properties
  116. BIN guide/images/.DS_Store
  117. BIN guide/images/installing-greenpages/.DS_Store
  118. +8 −8 guide/src/highlights.xml
  119. +15 −17 guide/src/installing-greenpages.xml
  120. +3 −3 {solution → }/pom.xml
  121. +0 −31 solution/greenpages.app/pom.xml
  122. +0 −37 solution/greenpages.web/src/main/webapp/WEB-INF/web.xml
  123. +0 −8 start/greenpages.app/.classpath
  124. +0 −41 start/greenpages.app/.project
  125. +0 −5 start/greenpages.app/.settings/org.eclipse.wst.common.project.facet.core.xml
  126. +0 −9 start/greenpages.app/.settings/org.maven.ide.eclipse.prefs
  127. +0 −15 start/greenpages.app/.springBeans
  128. +0 −43 start/greenpages.app/src/main/java/greenpages/Directory.java
  129. +0 −28 start/greenpages.app/src/main/java/greenpages/Listing.java
  130. +0 −59 start/greenpages.app/src/main/java/greenpages/internal/DirectoryImpl.java
  131. +0 −50 start/greenpages.app/src/main/java/greenpages/internal/ImmutableListing.java
  132. +0 −10 start/greenpages.app/src/main/resources/META-INF/MANIFEST.MF
  133. +0 −11 start/greenpages.app/src/main/resources/META-INF/spring/module-context.xml
  134. +0 −10 start/greenpages.app/src/main/resources/META-INF/spring/osgi-context.xml
  135. +0 −8 start/greenpages.app/template.mf
  136. +0 −10 start/greenpages.jpa/.classpath
  137. +0 −41 start/greenpages.jpa/.project
  138. +0 −19 start/greenpages.jpa/.settings/JpaDirectorySpringContextTests.launch
  139. +0 −4 start/greenpages.jpa/.settings/org.eclipse.wst.common.project.facet.core.xml
  140. +0 −9 start/greenpages.jpa/.settings/org.maven.ide.eclipse.prefs
  141. +0 −15 start/greenpages.jpa/.springBeans
  142. +0 −59 start/greenpages.jpa/pom.xml
  143. +0 −30 start/greenpages.jpa/src/main/java/greenpages/jpa/JpaDirectory.java
  144. +0 −61 start/greenpages.jpa/src/main/java/greenpages/jpa/JpaListing.java
  145. +0 −14 start/greenpages.jpa/src/main/resources/META-INF/MANIFEST.MF
  146. +0 −14 start/greenpages.jpa/src/main/resources/META-INF/spring/module-context.xml
  147. +0 −8 start/greenpages.jpa/src/main/resources/META-INF/spring/osgi-context.xml
  148. +0 −39 start/greenpages.jpa/src/test/java/greenpages/jpa/JpaDirectorySpringContextTests.java
  149. +0 −96 start/greenpages.jpa/src/test/java/greenpages/jpa/TestDataPopulator.java
  150. +0 −7 start/greenpages.jpa/src/test/resources/META-INF/spring/test-context.xml
  151. +0 −15 start/greenpages.jpa/template.mf
  152. +0 −13 start/greenpages.web/.classpath
  153. +0 −44 start/greenpages.web/.project
  154. +0 −11 start/greenpages.web/.settings/.jsdtscope
  155. +0 −18 start/greenpages.web/.settings/GreenPagesSpringContextTests.launch
  156. +0 −10 start/greenpages.web/.settings/org.eclipse.wst.common.component
  157. +0 −6 start/greenpages.web/.settings/org.eclipse.wst.common.project.facet.core.xml
  158. +0 −1 start/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.container
  159. +0 −1 start/greenpages.web/.settings/org.eclipse.wst.jsdt.ui.superType.name
  160. +0 −9 start/greenpages.web/.settings/org.maven.ide.eclipse.prefs
  161. +0 −3 start/greenpages.web/.settings/org.springframework.ide.eclipse.beans.core.prefs
  162. +0 −13 start/greenpages.web/.springBeans
  163. +0 −74 start/greenpages.web/pom.xml
  164. +0 −16 start/greenpages.web/src/main/webapp/META-INF/MANIFEST.MF
  165. +0 −11 start/greenpages.web/src/main/webapp/WEB-INF/applicationContext.xml
  166. +0 −49 start/greenpages.web/src/main/webapp/WEB-INF/ftl/entry.ftl
  167. +0 −50 start/greenpages.web/src/main/webapp/WEB-INF/ftl/home.ftl
  168. +0 −72 start/greenpages.web/src/main/webapp/WEB-INF/ftl/search.ftl
  169. +0 −24 start/greenpages.web/src/main/webapp/WEB-INF/greenpages-servlet.xml
  170. BIN start/greenpages.web/src/main/webapp/images/favicon.ico
  171. BIN start/greenpages.web/src/main/webapp/images/footer-left.png
  172. BIN start/greenpages.web/src/main/webapp/images/footer-right.png
  173. BIN start/greenpages.web/src/main/webapp/images/footer-stretch.png
  174. BIN start/greenpages.web/src/main/webapp/images/header-left.png
  175. BIN start/greenpages.web/src/main/webapp/images/header-right.png
  176. BIN start/greenpages.web/src/main/webapp/images/loader-white-large.gif
  177. BIN start/greenpages.web/src/main/webapp/images/loader-white-small.gif
  178. BIN start/greenpages.web/src/main/webapp/images/menu-curve-left.png
  179. BIN start/greenpages.web/src/main/webapp/images/menu-curve-right.png
  180. BIN start/greenpages.web/src/main/webapp/images/menu-stretch.png
  181. BIN start/greenpages.web/src/main/webapp/images/mini-header-left.png
  182. BIN start/greenpages.web/src/main/webapp/images/mini-header-right.png
  183. BIN start/greenpages.web/src/main/webapp/images/s2ap_soda_can.png
  184. BIN start/greenpages.web/src/main/webapp/images/spring.png
  185. BIN start/greenpages.web/src/main/webapp/images/table-header-background.png
  186. +0 −10 start/greenpages.web/src/main/webapp/index.html
  187. +0 −40 start/greenpages.web/src/main/webapp/styles/local.css
  188. +0 −290 start/greenpages.web/src/main/webapp/styles/main.css
  189. +0 −46 start/greenpages.web/src/main/webapp/styles/print.css
  190. +0 −44 start/greenpages.web/src/test/java/greenpages/tests/GreenPagesSpringContextTests.java
  191. +0 −96 start/greenpages.web/src/test/java/greenpages/tests/TestDataPopulator.java
  192. +0 −17 start/greenpages.web/src/test/resources/META-INF/spring/test-context.xml
  193. +0 −21 start/greenpages.web/template.mf
  194. +0 −6 start/parent/.classpath
  195. +0 −23 start/parent/.project
  196. +0 −9 start/parent/.settings/org.maven.ide.eclipse.prefs
  197. +0 −210 start/parent/pom.xml
  198. +0 −20 start/pom.xml
  199. +1 −1 virgo-build
View
BIN .DS_Store
Binary file not shown.
View
@@ -7,11 +7,47 @@
<pathelement location="../guide"/>
</path>
- <property name="integration.repo.dir" value="${basedir}/../integration-repo"/>
- <property name="ivy.cache.dir" value="${basedir}/../ivy-cache"/>
<property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../build.versions"/>
- <import file="${basedir}/package-top-level.xml"/>
<import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
+ <target name="package" description="Creates the release package for this project">
+ <delete dir="${package.output.dir}" quiet="true"/>
+ <mkdir dir="${package.output.dir}"/>
+ <delete file="${package.output.file}" quiet="true"/>
+ <mkdir dir="${artifacts.dir}"/>
+
+ <copy todir="${package.output.dir}">
+ <fileset dir="${basedir}/resources"/>
+ </copy>
+
+ <all-bundles buildpathRef="doc.bundles" target="doc">
+ <property name="docbook.output.dir" value="${package.docs.dir}"/>
+ </all-bundles>
+
+ <copy todir="${package.output.dir}">
+ <fileset dir="${basedir}/..">
+ <include name="db/**"/>
+ <include name="greenpages/**"/>
+ <include name="greenpages.core/**"/>
+ <include name="greenpages.db/**"/>
+ <include name="greenpages.jpa/**"/>
+ <include name="greenpages.web/**"/>
+ <include name="greenpages.parent/**"/>
+ <include name="pom.xml"/>
+ <exclude name="**/target/**"/>
+ </fileset>
+ </copy>
+
+ <chmod perm="755">
+ <fileset dir="${package.output.dir}">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ <zip destfile="${package.output.file}">
+ <zipfileset dir="${package.dir}" includes="${package.basename}/**/*.sh" filemode="755"/>
+ <zipfileset dir="${package.dir}" excludes="${package.basename}/**/*.sh"/>
+ </zip>
+ </target>
+
</project>
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="package-top-level">
-
- <target name="package" description="Creates the release package for this project">
- <delete dir="${package.output.dir}" quiet="true"/>
- <mkdir dir="${package.output.dir}"/>
- <delete file="${package.output.file}" quiet="true"/>
- <mkdir dir="${artifacts.dir}"/>
-
- <copy todir="${package.output.dir}">
- <fileset dir="${basedir}/resources"/>
- </copy>
-
- <all-bundles buildpathRef="doc.bundles" target="doc">
- <property name="docbook.output.dir" value="${package.docs.dir}"/>
- </all-bundles>
-
- <copy todir="${package.output.dir}">
- <fileset dir="${basedir}/..">
- <include name="db/**"/>
- <include name="start/**"/>
- <include name="solution/**"/>
- <exclude name="**/target/**"/>
- </fileset>
- </copy>
-
- <chmod perm="755">
- <fileset dir="${package.output.dir}">
- <include name="**/*.sh"/>
- </fileset>
- </chmod>
-
- <zip destfile="${package.output.file}">
- <zipfileset dir="${package.dir}" includes="${package.basename}/**/*.sh" filemode="755"/>
- <zipfileset dir="${package.dir}" excludes="${package.basename}/**/*.sh"/>
- </zip>
- </target>
-
-</project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -8,13 +8,12 @@
<groupId>org.eclipse.virgo</groupId>
<artifactId>greenpages.parent</artifactId>
<version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../greenpages.parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.app</artifactId>
- <name>greenpages.app</name>
+ <artifactId>greenpages.core</artifactId>
+ <name>greenpages.core</name>
<packaging>jar</packaging>
<dependencies>
@@ -24,6 +23,11 @@
<type>libd</type>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.instrument</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.junit</groupId>
<artifactId>com.springsource.org.junit</artifactId>
</dependency>
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GreenPages Service
-Bundle-SymbolicName: greenpages
+Bundle-SymbolicName: greenpages.core
Bundle-Vendor: SpringSource Inc.
Bundle-Version: 2.5.0
Import-Template:
- org.springframework.*;version="[3.0, 3.1)"
+ org.springframework.*;version="[3.0, 3.5)"
Excluded-Exports:
greenpages.internal
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent-solution</artifactId>
+ <artifactId>greenpages.parent</artifactId>
<version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../greenpages.parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>greenpages.db-solution</artifactId>
+ <artifactId>greenpages.db</artifactId>
<name>greenpages.db</name>
<packaging>jar</packaging>
@@ -43,9 +43,13 @@
<artifactId>com.springsource.org.h2</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.instrument</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.aspectj</groupId>
- <artifactId>org.aspectj-library</artifactId>
- <type>libd</type>
+ <artifactId>com.springsource.org.aspectj.weaver</artifactId>
</dependency>
</dependencies>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -6,20 +6,20 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent-solution</artifactId>
+ <artifactId>greenpages.parent</artifactId>
<version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../greenpages.parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>greenpages.jpa-solution</artifactId>
+ <artifactId>greenpages.jpa</artifactId>
<name>greenpages.jpa</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.app-solution</artifactId>
+ <artifactId>greenpages.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -50,8 +50,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.instrument</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>org.springframework.instrument</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -70,8 +71,7 @@
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
- <artifactId>org.aspectj-library</artifactId>
- <type>libd</type>
+ <artifactId>com.springsource.org.aspectj.weaver</artifactId>
</dependency>
</dependencies>
@@ -5,7 +5,7 @@ Bundle-SymbolicName: greenpages.jpa
Bundle-Vendor: SpringSource
Bundle-Version: 2.5.0
Import-Template:
- org.springframework.*;version="[3.0, 3.1)",
+ org.springframework.*;version="[3.0, 3.5)",
greenpages;version="[2.5, 2.6)",
javax.persistence;version="[1.0.0, 1.0.0]",
org.apache.commons.dbcp.*;version="[1.2.2.osgi, 1.2.2.osgi]",
@@ -14,8 +14,8 @@ Import-Bundle:
com.springsource.org.eclipse.persistence;version="[1.0.0, 1.0.0]",
com.springsource.org.eclipse.persistence.jpa;version="[1.0.0, 1.0.0]"
Import-Package:
- org.springframework.context.weaving;version="[3.0, 3.1)",
- org.springframework.transaction.aspectj;version="[3.0, 3.1)"
+ org.springframework.context.weaving;version="[3.0, 3.5)",
+ org.springframework.transaction.aspectj;version="[3.0, 3.5)"
Excluded-Exports:
greenpages.jpa
Excluded-Imports:
File renamed without changes.
File renamed without changes.
@@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent-solution</artifactId>
+ <artifactId>greenpages.parent</artifactId>
<version>2.5.0.RELEASE</version>
<name>greenpages.parent</name>
<packaging>pom</packaging>
@@ -52,9 +52,8 @@
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
- <artifactId>org.aspectj-library</artifactId>
- <type>libd</type>
- <version>1.6.2.RELEASE</version>
+ <artifactId>com.springsource.org.aspectj.weaver</artifactId>
+ <version>1.6.12.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -123,7 +122,7 @@
<name>SpringSource Enterprise Bundle Repository - SpringSource Library Releases</name>
<url>http://repository.springsource.com/maven/libraries/release</url>
</repository>
- <repository>
+ <!-- <repository>
<id>com.springsource.repository.libraries.external</id>
<name>SpringSource Enterprise Bundle Repository - External Library Releases</name>
<url>http://repository.springsource.com/maven/libraries/external</url>
@@ -137,7 +136,7 @@
<id>com.springsource.repository.libraries.snapshot</id>
<name>SpringSource Enterprise Bundle Repository - Snapshot Library Releases</name>
<url>http://repository.springsource.com/maven/libraries/snapshot</url>
- </repository>
+ </repository> -->
</repositories>
<properties>
@@ -150,24 +149,24 @@
<name>SpringSource Enterprise Bundle Repository - Releases</name>
<url>http://repository.springsource.com/maven/bundles/release</url>
</pluginRepository>
- <pluginRepository>
+ <!-- <pluginRepository>
<id>com.springsource.repository.bundles.milestone</id>
<name>SpringSource Enterprise Bundle Repository - Milestone</name>
<url>http://repository.springsource.com/maven/bundles/milestone</url>
- </pluginRepository>
+ </pluginRepository> -->
</pluginRepositories>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
- <version>1.0.0.M2</version>
+ <version>1.0.0.RELEASE</version>
<executions>
<execution>
<id>bundlor</id>
<goals>
- <goal>transform</goal>
+ <goal>bundlor</goal>
</goals>
<phase>package</phase>
</execution>
@@ -176,6 +175,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -184,6 +184,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<archive>
<manifestFile>
@@ -195,6 +196,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
<configuration>
<includes>
<include>**/*Tests.java</include>
@@ -203,7 +205,7 @@
<exclude>**/Abstract*.java</exclude>
</excludes>
<junitArtifactName>org.junit:com.springsource.org.junit</junitArtifactName>
- <argLine>-javaagent:${user.home}/.m2/repository/org/springframework/org.springframework.instrument/3.0.0.M3/org.springframework.instrument-3.0.0.M3.jar</argLine>
+ <argLine>-javaagent:${user.home}/.m2/repository/org/springframework/org.springframework.instrument/3.0.5.RELEASE/org.springframework.instrument-3.0.5.RELEASE.jar</argLine>
</configuration>
</plugin>
</plugins>
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -6,20 +6,20 @@
<parent>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.parent-solution</artifactId>
+ <artifactId>greenpages.parent</artifactId>
<version>2.5.0.RELEASE</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../greenpages.parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>greenpages.web-solution</artifactId>
+ <artifactId>greenpages.web</artifactId>
<name>greenpages.web</name>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.app-solution</artifactId>
+ <artifactId>greenpages.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.virgo</groupId>
- <artifactId>greenpages.jpa-solution</artifactId>
+ <artifactId>greenpages.jpa</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -76,8 +76,7 @@
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
- <artifactId>org.aspectj-library</artifactId>
- <type>libd</type>
+ <artifactId>com.springsource.org.aspectj.weaver</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -86,7 +85,7 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
+ <version>2.2</version>
<configuration>
<packagingExcludes>WEB-INF/lib/**</packagingExcludes>
</configuration>
Oops, something went wrong.

0 comments on commit 9243852

Please sign in to comment.