Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

INT-2388 Update Gradle build

This is a significant update to the build system, including the changes
listed below. README.md has been updated with instructions on the most
important day-to-day commands.

 - Eliminate buildSrc submodule

   In favor of using the new bundlor and docbook-reference plugins. The
   net effect is a large reduction in number of lines of build code.
   Common docbook resources, stylesheets, etc are stored directly in the
   docbook plugin.

   This means that --recursive is no longer required when cloning and
   there will never be a need to use `git submodule` commands. README
   files have been updated to reflect.

   Use of the new bundlor plugin also means the removal of template.mf
   files from the source tree in favor of an inline approach. See
   build.gradle for details. Bundlor 'import templates' are built up
   programmatically and kept physically close to gradle dependency
   declarations, leading to more convenience when changing these values
   and hopefully fewer errors / version inconsistencies over time.

   Certain tests depended on the presence of template.mf files, all of
   which have recently been removed from the source tree in favor of the
   new bundlor plugin which allows for inlining bundlor configuration
   within the Gradle build script. These tests now create temp files
   using the java.io.File API instead.

 - Upgrade to Gradle 1.0-milestone-6

   The m6 release is significantly faster when resolving dependencies
   and has a number of valuable new features over the earlier m3
   version. Review the release notes for Gradle 1.0-milestone-6 online
   for full details.

 - Switch to repo.springsource.org repository

   Previously the project build declared as many repositories as
   necessary to resolve all project dependencies.

   Now depending on a single 'virtual repository' defined within the
   SpringSource Artifactory instance at http://repo.springsource.org.
   Currently, the virtual repository in use is 'libs-milestone', which
   allows for the resolution of all "milestone-or-better" versions of
   all S2 and third-party dependencies.

   Should snapshot dependencies become required, this value may be
   changed from 'libs-milestone' to 'libs-snapshot'. To build only
   against GA releases, change the value to 'libs-release'.

 - New build plan(s)

   Spring Integration build plans have been updated to use the
   Artifactory Bamboo plugin and publish to repo.springsource.org.
   Build plans have names like 2.1.x to reflect the version under
   development, not necessarily the name of the branch, as this may
   change over time and across major releases.

 - Improve release process

   As mentioned above, Spring Integration will now use the Artifactory
   Bamboo plugin to publish releases and also use Artifactory's support
   for pushing builds directly into Maven Central via oss.sonatype.org.

   Generate poms that contain all necessary fields for onboarding at
   Maven central (scm, developers, organization, licenses, etc).

   Generate -source and -javadoc poms to comply with Maven Central
   onboarding rules (and for general good practice anyway).

   Generation of PGP signatures, sha1 and md5 checksums are all handled
   automatically by Artifactory. These are also requirements for
   automated entry into Maven Central.

 - Remove source-level pom generation

   Automatic generation of Maven poms suitable for use in building
   Spring Integration is no longer supported. Generation and
   publication of poms for the purpose of dependency management remains
   supported.

   Sonar support has to date depended on these poms, but will be
   switched over to use the Gradle Sonar plugin shortly.

 - Eliminate docs subproject

   Move docs/src to the root of the project and eliminate docs as a
   formal subproject. This simplifies the build in a number of ways,
   including removing the need for distinguishing between 'subprojects'
   and 'javaprojects' as well as allowing users to build both 'api' and
   'reference' docs without qualifying with a ':docs' prefix.

   Also rename the src/info directory to src/dist to better reflect that
   these files are packaged with the distribution. For example, the
   readme.txt there is really the distribution readme, distinct from the
   README.md at the root of the project which is for building from source,
   etc.
  • Loading branch information...
commit f30da932e8e66be57b79415caa2c8e0f95065499 1 parent ae0ecff
Chris Beams cbeams authored markfisher committed
Showing with 808 additions and 7,507 deletions.
  1. +0 −3  .gitmodules
  2. BIN  .wrapper/gradle-wrapper.jar
  3. +6 −0 .wrapper/gradle-wrapper.properties
  4. +20 −15 README.md
  5. +655 −129 build.gradle
  6. +0 −1  buildSrc
  7. +0 −36 docs/src/info/readme.txt
  8. +0 −35 docs/src/reference/resources/css/highlight.css
  9. +0 −421 docs/src/reference/resources/css/html.css
  10. +0 −69 docs/src/reference/resources/css/manual.css
  11. +0 −99 docs/src/reference/resources/css/stylesheet.css
  12. BIN  docs/src/reference/resources/images/admon/caution.png
  13. BIN  docs/src/reference/resources/images/admon/important.png
  14. BIN  docs/src/reference/resources/images/admon/note-spr.jpg
  15. BIN  docs/src/reference/resources/images/admon/note.png
  16. BIN  docs/src/reference/resources/images/admon/tip.png
  17. BIN  docs/src/reference/resources/images/admon/warning.png
  18. BIN  docs/src/reference/resources/images/callouts/1.gif
  19. BIN  docs/src/reference/resources/images/callouts/1.png
  20. +0 −15 docs/src/reference/resources/images/callouts/1.svg
  21. BIN  docs/src/reference/resources/images/callouts/10.gif
  22. BIN  docs/src/reference/resources/images/callouts/10.png
  23. +0 −18 docs/src/reference/resources/images/callouts/10.svg
  24. BIN  docs/src/reference/resources/images/callouts/11.gif
  25. BIN  docs/src/reference/resources/images/callouts/11.png
  26. +0 −16 docs/src/reference/resources/images/callouts/11.svg
  27. BIN  docs/src/reference/resources/images/callouts/12.gif
  28. BIN  docs/src/reference/resources/images/callouts/12.png
  29. +0 −18 docs/src/reference/resources/images/callouts/12.svg
  30. BIN  docs/src/reference/resources/images/callouts/13.gif
  31. BIN  docs/src/reference/resources/images/callouts/13.png
  32. +0 −20 docs/src/reference/resources/images/callouts/13.svg
  33. BIN  docs/src/reference/resources/images/callouts/14.gif
  34. BIN  docs/src/reference/resources/images/callouts/14.png
  35. +0 −17 docs/src/reference/resources/images/callouts/14.svg
  36. BIN  docs/src/reference/resources/images/callouts/15.gif
  37. BIN  docs/src/reference/resources/images/callouts/15.png
  38. +0 −19 docs/src/reference/resources/images/callouts/15.svg
  39. +0 −20 docs/src/reference/resources/images/callouts/16.svg
  40. +0 −17 docs/src/reference/resources/images/callouts/17.svg
  41. +0 −21 docs/src/reference/resources/images/callouts/18.svg
  42. +0 −20 docs/src/reference/resources/images/callouts/19.svg
  43. BIN  docs/src/reference/resources/images/callouts/2.gif
  44. BIN  docs/src/reference/resources/images/callouts/2.png
  45. +0 −17 docs/src/reference/resources/images/callouts/2.svg
  46. +0 −20 docs/src/reference/resources/images/callouts/20.svg
  47. +0 −18 docs/src/reference/resources/images/callouts/21.svg
  48. +0 −20 docs/src/reference/resources/images/callouts/22.svg
  49. +0 −22 docs/src/reference/resources/images/callouts/23.svg
  50. +0 −19 docs/src/reference/resources/images/callouts/24.svg
  51. +0 −21 docs/src/reference/resources/images/callouts/25.svg
  52. +0 −22 docs/src/reference/resources/images/callouts/26.svg
  53. +0 −19 docs/src/reference/resources/images/callouts/27.svg
  54. +0 −23 docs/src/reference/resources/images/callouts/28.svg
  55. +0 −22 docs/src/reference/resources/images/callouts/29.svg
  56. BIN  docs/src/reference/resources/images/callouts/3.gif
  57. BIN  docs/src/reference/resources/images/callouts/3.png
  58. +0 −19 docs/src/reference/resources/images/callouts/3.svg
  59. +0 −22 docs/src/reference/resources/images/callouts/30.svg
  60. BIN  docs/src/reference/resources/images/callouts/4.gif
  61. BIN  docs/src/reference/resources/images/callouts/4.png
  62. +0 −16 docs/src/reference/resources/images/callouts/4.svg
  63. BIN  docs/src/reference/resources/images/callouts/5.gif
  64. BIN  docs/src/reference/resources/images/callouts/5.png
  65. +0 −18 docs/src/reference/resources/images/callouts/5.svg
  66. BIN  docs/src/reference/resources/images/callouts/6.gif
  67. BIN  docs/src/reference/resources/images/callouts/6.png
  68. +0 −19 docs/src/reference/resources/images/callouts/6.svg
  69. BIN  docs/src/reference/resources/images/callouts/7.gif
  70. BIN  docs/src/reference/resources/images/callouts/7.png
  71. +0 −16 docs/src/reference/resources/images/callouts/7.svg
  72. BIN  docs/src/reference/resources/images/callouts/8.gif
  73. BIN  docs/src/reference/resources/images/callouts/8.png
  74. +0 −20 docs/src/reference/resources/images/callouts/8.svg
  75. BIN  docs/src/reference/resources/images/callouts/9.gif
  76. BIN  docs/src/reference/resources/images/callouts/9.png
  77. +0 −19 docs/src/reference/resources/images/callouts/9.svg
  78. +0 −145 docs/src/reference/resources/xsl/html-custom.xsl
  79. +0 −142 docs/src/reference/resources/xsl/html-single-custom.xsl
  80. +0 −487 docs/src/reference/resources/xsl/pdf-custom.xsl
  81. +1 −43 gradle.properties
  82. +52 −55 gradlew
  83. +30 −22 gradlew.bat
  84. +0 −38 pom.xml
  85. +0 −17 settings.gradle
  86. +0 −206 spring-integration-amqp/pom.xml
  87. +0 −15 spring-integration-amqp/template.mf
  88. +0 −181 spring-integration-core/pom.xml
  89. +0 −12 spring-integration-core/template.mf
  90. +0 −161 spring-integration-event/pom.xml
  91. +0 −13 spring-integration-event/template.mf
  92. +0 −179 spring-integration-feed/pom.xml
  93. +0 −18 spring-integration-feed/template.mf
  94. +0 −161 spring-integration-file/pom.xml
  95. +0 −16 spring-integration-file/template.mf
  96. +0 −174 spring-integration-ftp/pom.xml
  97. +15 −10 ...tegration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandlerTests.java
  98. +0 −16 spring-integration-ftp/template.mf
  99. +0 −191 spring-integration-gemfire/pom.xml
  100. +0 −16 spring-integration-gemfire/template.mf
  101. +0 −167 spring-integration-groovy/pom.xml
  102. +0 −11 spring-integration-groovy/template.mf
  103. +0 −200 spring-integration-http/pom.xml
  104. +0 −20 spring-integration-http/template.mf
  105. +0 −167 spring-integration-ip/pom.xml
  106. +0 −15 spring-integration-ip/template.mf
  107. +0 −1  spring-integration-jdbc/build.gradle
  108. +0 −207 spring-integration-jdbc/pom.xml
  109. +0 −12 spring-integration-jdbc/template.mf
  110. +0 −191 spring-integration-jms/pom.xml
  111. +0 −16 spring-integration-jms/template.mf
  112. +0 −173 spring-integration-jmx/pom.xml
  113. +0 −12 spring-integration-jmx/template.mf
  114. +0 −174 spring-integration-mail/pom.xml
  115. +0 −16 spring-integration-mail/template.mf
  116. +0 −197 spring-integration-mongodb/pom.xml
  117. +0 −16 spring-integration-mongodb/template.mf
  118. +0 −197 spring-integration-redis/pom.xml
  119. +0 −15 spring-integration-redis/template.mf
  120. +0 −167 spring-integration-rmi/pom.xml
  121. +0 −14 spring-integration-rmi/template.mf
  122. +0 −173 spring-integration-scripting/pom.xml
  123. +0 −11 spring-integration-scripting/template.mf
  124. +0 −185 spring-integration-security/pom.xml
  125. +0 −15 spring-integration-security/template.mf
  126. +0 −186 spring-integration-sftp/pom.xml
  127. +14 −9 ...ration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpSendingMessageHandlerTests.java
  128. +0 −16 spring-integration-sftp/template.mf
  129. +0 −155 spring-integration-stream/pom.xml
  130. +0 −11 spring-integration-stream/template.mf
  131. +0 −155 spring-integration-test/pom.xml
  132. +0 −14 spring-integration-test/template.mf
  133. +0 −204 spring-integration-twitter/pom.xml
  134. +0 −20 spring-integration-twitter/template.mf
  135. +0 −232 spring-integration-ws/pom.xml
  136. +0 −18 spring-integration-ws/template.mf
  137. +0 −196 spring-integration-xml/pom.xml
  138. +0 −18 spring-integration-xml/template.mf
  139. +0 −186 spring-integration-xmpp/pom.xml
  140. +0 −15 spring-integration-xmpp/template.mf
  141. 0  {docs → }/src/api/doc-files/th-background.png
  142. +2 −1  {docs → }/src/api/overview.html
  143. 0  {docs → }/src/api/spring-javadoc.css
  144. 0  {docs/src/info → src/dist}/changelog.txt
  145. 0  {docs/src/info → src/dist}/license.txt
  146. 0  {docs/src/info → src/dist}/notice.txt
  147. +13 −0 src/dist/readme.txt
  148. 0  {docs → }/src/reference/docbook/aggregator.xml
  149. 0  {docs → }/src/reference/docbook/amqp.xml
  150. 0  {docs → }/src/reference/docbook/bridge.xml
  151. 0  {docs → }/src/reference/docbook/chain.xml
  152. 0  {docs → }/src/reference/docbook/changes-1.0-2.0.xml
  153. 0  {docs → }/src/reference/docbook/changes-2.0-2.1.xml
  154. 0  {docs → }/src/reference/docbook/channel-adapter.xml
  155. 0  {docs → }/src/reference/docbook/channel.xml
  156. 0  {docs → }/src/reference/docbook/claim-check.xml
  157. 0  {docs → }/src/reference/docbook/configuration.xml
  158. 0  {docs → }/src/reference/docbook/content-enrichment.xml
  159. 0  {docs → }/src/reference/docbook/control-bus.xml
  160. 0  {docs → }/src/reference/docbook/delayer.xml
  161. 0  {docs → }/src/reference/docbook/endpoint.xml
  162. 0  {docs → }/src/reference/docbook/event.xml
  163. 0  {docs → }/src/reference/docbook/feed.xml
  164. 0  {docs → }/src/reference/docbook/file.xml
  165. 0  {docs → }/src/reference/docbook/filter.xml
  166. 0  {docs → }/src/reference/docbook/ftp.xml
  167. 0  {docs → }/src/reference/docbook/gateway.xml
  168. 0  {docs → }/src/reference/docbook/gemfire.xml
  169. 0  {docs → }/src/reference/docbook/groovy.xml
  170. 0  {docs → }/src/reference/docbook/history.xml
  171. 0  {docs → }/src/reference/docbook/http.xml
  172. 0  {docs/src/reference/resources → src/reference/docbook}/images/bank-router.jpg
  173. 0  {docs/src/reference/resources → src/reference/docbook}/images/cafe-eip.png
  174. 0  {docs/src/reference/resources → src/reference/docbook}/images/chain.png
  175. 0  {docs/src/reference/resources → src/reference/docbook}/images/channel.jpg
  176. 0  {docs/src/reference/resources → src/reference/docbook}/images/gateway.jpg
  177. 0  {docs/src/reference/resources → src/reference/docbook}/images/handler-endpoint.jpg
  178. 0  {docs/src/reference/resources → src/reference/docbook}/images/loan-broker-eip.png
  179. 0  {docs/src/reference/resources → src/reference/docbook}/images/logo.png
  180. 0  {docs/src/reference/resources → src/reference/docbook}/images/message.jpg
  181. 0  {docs/src/reference/resources → src/reference/docbook}/images/quotes-aggregator.jpg
  182. 0  {docs/src/reference/resources → src/reference/docbook}/images/router.jpg
  183. 0  {docs/src/reference/resources → src/reference/docbook}/images/source-endpoint.jpg
  184. 0  {docs/src/reference/resources → src/reference/docbook}/images/spring-integration-amqp-sample-graph.png
  185. 0  {docs/src/reference/resources → src/reference/docbook}/images/target-endpoint.jpg
  186. 0  {docs/src/reference/resources → src/reference/docbook}/images/tickmark.png
  187. 0  {docs → }/src/reference/docbook/index.xml
  188. 0  {docs → }/src/reference/docbook/ip.xml
  189. 0  {docs → }/src/reference/docbook/jdbc.xml
  190. 0  {docs → }/src/reference/docbook/jms.xml
  191. 0  {docs → }/src/reference/docbook/jmx.xml
  192. 0  {docs → }/src/reference/docbook/mail.xml
  193. 0  {docs → }/src/reference/docbook/message-construction.xml
  194. 0  {docs → }/src/reference/docbook/message-history.xml
  195. 0  {docs → }/src/reference/docbook/message-publishing.xml
  196. 0  {docs → }/src/reference/docbook/message-routing.xml
  197. 0  {docs → }/src/reference/docbook/message-store.xml
  198. 0  {docs → }/src/reference/docbook/message-transformation.xml
  199. 0  {docs → }/src/reference/docbook/message.xml
  200. 0  {docs → }/src/reference/docbook/messaging-channels.xml
  201. 0  {docs → }/src/reference/docbook/messaging-endpoints.xml
  202. 0  {docs → }/src/reference/docbook/mongodb.xml
  203. 0  {docs → }/src/reference/docbook/overview.xml
  204. 0  {docs → }/src/reference/docbook/preface.xml
  205. 0  {docs → }/src/reference/docbook/redis.xml
  206. 0  {docs → }/src/reference/docbook/resequencer.xml
  207. 0  {docs → }/src/reference/docbook/resource.xml
  208. 0  {docs → }/src/reference/docbook/resources.xml
  209. 0  {docs → }/src/reference/docbook/rmi.xml
  210. 0  {docs → }/src/reference/docbook/router.xml
  211. 0  {docs → }/src/reference/docbook/samples.xml
  212. 0  {docs → }/src/reference/docbook/scripting.xml
  213. 0  {docs → }/src/reference/docbook/security.xml
  214. 0  {docs → }/src/reference/docbook/service-activator.xml
  215. 0  {docs → }/src/reference/docbook/sftp.xml
  216. 0  {docs → }/src/reference/docbook/splitter.xml
  217. 0  {docs → }/src/reference/docbook/stream.xml
  218. 0  {docs → }/src/reference/docbook/system-management.xml
  219. 0  {docs → }/src/reference/docbook/transactions.xml
  220. 0  {docs → }/src/reference/docbook/transformer.xml
  221. 0  {docs → }/src/reference/docbook/twitter.xml
  222. 0  {docs → }/src/reference/docbook/whats-new.xml
  223. 0  {docs → }/src/reference/docbook/ws.xml
  224. 0  {docs → }/src/reference/docbook/xml.xml
  225. 0  {docs → }/src/reference/docbook/xmpp.xml
3  .gitmodules
View
@@ -1,3 +0,0 @@
-[submodule "buildSrc"]
- path = buildSrc
- url = git://github.com/SpringSource/spring-build-gradle.git
BIN  .wrapper/gradle-wrapper.jar
View
Binary file not shown
6 .wrapper/gradle-wrapper.properties
View
@@ -0,0 +1,6 @@
+#Wed Dec 21 17:31:27 CET 2011
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-1.0-milestone-6-bin.zip
35 README.md
View
@@ -5,17 +5,29 @@ Spring Integration
To check out the project and build from source, do the following:
- git clone --recursive git://github.com/SpringSource/spring-integration.git
+ git clone git://github.com/SpringSource/spring-integration.git
cd spring-integration
./gradlew build
-> Note: the **<code>--recursive</code>** switch above is important, as spring-integration uses
-> *git submodules*, which must themselves be cloned and initialized. If **<code>--recursive</code>**
-> is omitted, the checkout becomes a multi-step process.
+If you encounter out of memory errors during the build, increase available heap and permgen for Gradle:
-If you encounter heap space errors during the build, increase the heap size for Gradle:
+ GRADLE_OPTS='-XX:MaxPermSize=1024m -Xmx1024m'
- GRADLE_OPTS="-Xmx1024m"
+To build and install jars into your local Maven cache:
+
+ ./gradlew install
+
+To build api Javadoc (results will be in `build/api`):
+
+ ./gradlew api
+
+To build reference documentation (results will be in `build/reference`):
+
+ ./gradlew reference
+
+To build complete distribution including `-dist`, `-docs`, and `-schema` zip files (results will be in `build/distributions`)
+
+ ./gradlew dist
# Using Eclipse
@@ -36,14 +48,6 @@ To generate IDEA metadata (.iml and .ipr files), do the following:
./gradlew idea
-# Generating JavaDoc
-
-To build the JavaDoc, do the following from within the root directory:
-
- ./gradlew :docs:api
-
-The result will be available in **'docs/build/api'**.
-
# OSGI Notes
1. Dependency on Third Party Bundles
@@ -69,4 +73,5 @@ The result will be available in **'docs/build/api'**.
# Resources
-For more information, please visit the Spring Integration website at: [http://www.springsource.org/spring-integration](http://www.springsource.org/spring-integration)
+For more information, please visit the Spring Integration website at:
+[http://www.springsource.org/spring-integration](http://www.springsource.org/spring-integration)
784 build.gradle
View
@@ -1,118 +1,38 @@
-/*
- * Copyright 2002-2011 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.springframework.build.Version
-
-// -----------------------------------------------------------------------------
-// Main gradle build file for Spring Integration
-//
-// - run `./gradlew(.bat) build` to kick off a complete compile-test-package
-//
-// @author Chris Beams
-// @author Mark Fisher
-// @author Oleg Zhurakousky
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// Configuration for the root project
-// -----------------------------------------------------------------------------
-// used for artifact names, building doc upload urls, etc.
description = 'Spring Integration'
-abbreviation = 'INT'
apply plugin: 'base'
apply plugin: 'idea'
-def buildSrcDir = "$rootDir/buildSrc"
-apply from: "$buildSrcDir/wrapper.gradle"
-apply from: "$buildSrcDir/maven-root-pom.gradle"
-
-// Tie pom generation into the standard build lifecycle (INT-1609)
-assemble.dependsOn generatePom
-
+buildscript {
+ repositories {
+ maven { url 'https://repo.springsource.org/plugins-release' }
+ }
+ dependencies {
+ classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.0'
+ classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.0'
+ }
+}
-// -----------------------------------------------------------------------------
-// Configuration for all projects including this one (the root project)
-//
-// @see settings.gradle for list of all subprojects
-// -----------------------------------------------------------------------------
allprojects {
- // group will translate to groupId during pom generation and deployment
group = 'org.springframework.integration'
- // version will be used in maven pom generation as well as determining
- // where artifacts should be deployed, based on release type of snapshot,
- // milestone or release.
- // @see org.springframework.build.Version under buildSrc/ for more info
- // @see gradle.properties for the declaration of this property.
- version = new Version(springIntegrationVersion)
-
- // default set of maven repositories to be used when resolving dependencies
repositories {
- //mavenRepo name: 'SpringSource Snapshot Repository', urls: 'http://maven.springframework.org/snapshot'
- mavenRepo name: 'SpringSource Milestone Repository', urls: 'http://maven.springframework.org/milestone'
- mavenCentral()
- // only really necessary for artifacts not yet in Maven Central, i.e. immediately post-release
- mavenRepo name: 'SpringSource Release Repository', urls: 'http://maven.springframework.org/release'
- // needed for bundlor:
- mavenRepo name: 'SpringSource Release Bundle Repository', urls: 'http://repository.springsource.com/maven/bundles/release'
- // needed for external dependencies required by bundlor:
- mavenRepo name: 'SpringSource External Bundle Repository', urls: 'http://repository.springsource.com/maven/bundles/external'
+ maven { url 'http://repo.springsource.org/libs-milestone' }
+ maven { url 'http://repo.springsource.org/plugins-release' } // for bundlor
}
}
-
-// -----------------------------------------------------------------------------
-// Create collections of subprojects - each will receive their own configuration
-// - all subprojects that start with spring-integration-* are 'java projects'
-// - documentation-related subprojects are not collected here
-//
-// @see configure(*) sections below
-// -----------------------------------------------------------------------------
-javaprojects = subprojects.findAll { project ->
- project.path.startsWith(':spring-integration-')
-}
-
-
-// -----------------------------------------------------------------------------
-// Configuration for all java subprojects
-// -----------------------------------------------------------------------------
-configure(javaprojects) {
-
- apply plugin: 'java' // tasks for conventional java lifecycle
- apply plugin: 'maven' // `gradle install` to push jars to local .m2 cache
- apply plugin: 'eclipse' // `gradle eclipse` to generate .classpath/.project
- apply plugin: 'idea' // `gradle idea` to generate .ipr/.iml
- apply plugin: 'bundlor' // all core projects should be OSGi-compliant
+subprojects { subproject ->
+ apply plugin: 'java'
+ apply plugin: 'maven'
+ apply plugin: 'eclipse'
+ apply plugin: 'idea'
+ apply plugin: 'bundlor'
// ensure JDK 5 compatibility (GRADLE-18; INT-1578)
sourceCompatibility=1.5
targetCompatibility=1.5
- // set up dedicated directories for jars and source jars.
- // this makes it easier when putting together the distribution
- libsBinDir = new File(libsDir, 'bin')
- libsSrcDir = new File(libsDir, 'src')
-
- // add tasks for creating source jars and generating poms etc
- apply from: "$buildSrcDir/maven-deployment.gradle"
-
- // add tasks for finding and publishing .xsd files
- apply from: "$buildSrcDir/schema-publication.gradle"
-
aspectjVersion = '1.6.8'
cglibVersion = '2.2'
commonsNetVersion = '3.0.1'
@@ -156,21 +76,45 @@ configure(javaprojects) {
xLintArg = '-Xlint:all'
[compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg]
- // Tie pom generation into the standard build lifecycle (INT-1609)
- assemble.dependsOn generatePom
-
test {
// suppress all console output during testing unless running `gradle -i`
logging.captureStandardOutput(LogLevel.INFO)
}
-}
+ bundlor {
+ enabled = true
+ failOnWarnings = true
+ bundleManifestVersion = 2
+ bundleVendor = 'SpringSource'
+ bundleName = project.description
+ bundleVersion = project.version
+ importTemplate = [
+ 'org.apache.log4j.*;version="['+log4jVersion+'], 2.0.0)"'
+ ]
+ }
+
+ task sourcesJar(type: Jar) {
+ classifier = 'sources'
+ from sourceSets.main.allJava
+ }
+
+ task javadocJar(type: Jar) {
+ classifier = 'javadoc'
+ from javadoc
+ }
+
+ artifacts {
+ archives sourcesJar
+ archives javadocJar
+ }
+
+ install {
+ repositories.mavenInstaller {
+ customizePom(pom, subproject)
+ }
+ }
+}
-// -----------------------------------------------------------------------------
-// Configuration for each individual core java subproject
-//
-// @see configure(javaprojects) above for general config
-// -----------------------------------------------------------------------------
project('spring-integration-amqp') {
description = 'Spring Integration AMQP Support'
dependencies {
@@ -188,6 +132,24 @@ project('spring-integration-amqp') {
testCompile project(":spring-integration-stream")
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.amqp'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.apache.commons.lang.*;version="[2.5.0, 3.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.transaction.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.amqp.*;version="[1.0.0, 2.0.0)"',
+ 'org.aopalliance.*;version="[1.0.0, 2.0.0)"',
+ 'javax.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-core') {
@@ -200,15 +162,38 @@ project('spring-integration-core') {
testCompile "org.aspectj:aspectjrt:$aspectjVersion"
testCompile "org.aspectj:aspectjweaver:$aspectjVersion"
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration'
+ importTemplate += [
+ 'org.springframework.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.transaction;version="[3.0.5, 4.0.0)";resolution:=optional',
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.aopalliance.*;version="[1.0.0, 2.0.0)"',
+ 'org.codehaus.jackson.*;version="[1.0.0, 2.0.0)";resolution:=optional',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-event') {
- description = 'Spring Integration Event Support'
+ description = 'Spring Integration ApplicationEvent Support'
dependencies {
compile project(":spring-integration-core")
compile "org.springframework:spring-context:$springVersion"
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.event'
+ importTemplate += [
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-feed') {
@@ -222,6 +207,23 @@ project('spring-integration-feed') {
compile "net.java.dev.rome:rome:1.0.0"
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.feed'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.apache.commons.lang.*;version="[2.5.0, 3.0.0)"',
+ 'org.apache.commons.net.*;version="[2.0.0, 3.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'com.sun.syndication.*;version="[1.0.0, 2.0.0)"',
+ 'javax.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-file') {
@@ -231,6 +233,22 @@ project('spring-integration-file') {
compile "org.springframework:spring-context:$springVersion"
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.file'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.transaction.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util.xml;version="[3.0.5, 4.0.0)"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-ftp') {
@@ -242,15 +260,29 @@ project('spring-integration-ftp') {
compile("javax.activation:activation:$javaxActivationVersion") { optional = true }
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.ftp'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.apache.commons.net.*;version="[2.0.0, 3.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'javax.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
-
project('spring-integration-gemfire') {
description = 'Spring Integration GemFire Support'
- test{
- forkEvery = 1
- systemProperties['gemfire.disableShutdownHook'] = 'true'
- }
+ test {
+ forkEvery = 1
+ systemProperties['gemfire.disableShutdownHook'] = 'true'
+ }
dependencies {
compile project(":spring-integration-core")
compile ("org.springframework.data:spring-data-gemfire:$springGemfireVersion") {
@@ -262,8 +294,21 @@ project('spring-integration-gemfire') {
testCompile project(":spring-integration-stream")
testCompile project(":spring-integration-test")
}
- repositories {
- mavenRepo urls: 'http://dist.gemstone.com/maven/release' // for gemfire
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.gemfire'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.data.gemfire.*;version="[1.0.1, 2.0.0)"',
+ 'com.gemstone.gemfire.*;version="[6.5.1, 7.0.0)"',
+ 'javax.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
}
}
@@ -275,6 +320,16 @@ project('spring-integration-groovy') {
compile "org.codehaus.groovy:groovy-all:$groovyVersion"
compile "org.springframework:spring-context-support:$springVersion"
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.groovy'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.*;version="[3.0.5, 4.0.0)"',
+ 'groovy.*;version="[1.7.3, 2.0.0)"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-http') {
@@ -294,6 +349,25 @@ project('spring-integration-http') {
compile ("net.java.dev.rome:rome:1.0.0") { optional = true }
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.http'
+ importTemplate += [
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.http.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.validation.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.web.*;version="[3.0.5, 4.0.0)";resolution:=optional',
+ 'org.apache.commons.httpclient.*;version="[3.0.5, 4.0.0)"',
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional',
+ 'javax.xml.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-ip') {
@@ -304,6 +378,21 @@ project('spring-integration-ip') {
runtime project(":spring-integration-stream")
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.ip'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.jmx.*;version="[3.0.5, 4.0.0)"',
+ 'org.w3c.dom.*;version="0"',
+ 'javax.net.*;version="0"'
+ ]
+ }
}
project('spring-integration-jdbc') {
@@ -320,6 +409,17 @@ project('spring-integration-jdbc') {
testCompile "org.aspectj:aspectjrt:$aspectjVersion"
testCompile "org.aspectj:aspectjweaver:$aspectjVersion"
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.jdbc'
+ importTemplate += [
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.*;version="[3.0.5, 4.0.0)"',
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.aopalliance.*;version="[1.0.0, 2.0.0)"',
+ 'javax.sql.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
// suppress derby localization jar path warnings during test compilation
compileTestJava.options.compilerArgs = ["${xLintArg},-path"]
@@ -335,10 +435,26 @@ project('spring-integration-jms') {
testCompile project(":spring-integration-test")
testCompile ("org.apache.activemq:activemq-core:5.3.0") {
exclude group: 'org.springframework', module: 'spring-context'
- }
-
+ }
+
testCompile "org.springframework:spring-oxm:$springVersion"
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.jms'
+ importTemplate += [
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.jms.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.transaction.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'javax.jms;version="[1.1.0, 2.0.0)";resolution:=optional',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-jmx') {
@@ -350,6 +466,17 @@ project('spring-integration-jmx') {
compile "org.springframework:spring-context:$springVersion"
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.jmx'
+ importTemplate += [
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.*;version="[3.0.5, 4.0.0)"',
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.aopalliance.*;version="[1.0.0, 2.0.0)"',
+ 'javax.management.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-mail') {
@@ -361,6 +488,23 @@ project('spring-integration-mail') {
compile("javax.activation:activation:$javaxActivationVersion") { optional = true }
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.mail'
+ importTemplate += [
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.mail.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util.*;version="[3.0.5, 4.0.0)"',
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'javax.mail.*;version="[1.4.0, 2.0.0)"',
+ 'com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
// suppress javax.activation path warnings
[compileJava,compileTestJava]*.options*.compilerArgs = ["${xLintArg},-path"]
@@ -382,6 +526,24 @@ project('spring-integration-mongodb') {
}
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.mongodb'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.jmx.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.data.mongodb.*;version="[1.0.0, 2.0.0)"',
+ 'org.springframework.data.mapping.*;version="[1.0.0, 2.0.0)"',
+ 'com.mongodb.*;version="[2.4.0, 2.5.0]"',
+ 'javax.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-redis') {
@@ -389,8 +551,8 @@ project('spring-integration-redis') {
dependencies {
compile project(":spring-integration-core")
compile "org.springframework:spring-tx:$springVersion"
- compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion")
- compile("org.codehaus.jackson:jackson-core-asl:$jacksonVersion")
+ compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion")
+ compile("org.codehaus.jackson:jackson-core-asl:$jacksonVersion")
compile ("org.springframework.data:spring-data-redis:$springDataRedisVersion") {
exclude group: 'org.springframework', module: 'spring-core'
exclude group: 'org.springframework', module: 'spring-context-support'
@@ -399,6 +561,21 @@ project('spring-integration-redis') {
}
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.redis'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.data.redis.*;version="[1.0.0, 2.0.0)"',
+ 'javax.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-rmi') {
@@ -409,6 +586,19 @@ project('spring-integration-rmi') {
compile "org.springframework:spring-context:$springVersion"
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.rmi'
+ importTemplate += [
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.remoting.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
// suppress deprecation warnings (@SuppressWarnings("deprecation") is not enough for javac)
compileJava.options.compilerArgs = ["${xLintArg},-deprecation"]
@@ -423,6 +613,16 @@ project('spring-integration-scripting') {
testCompile("org.codehaus.groovy:groovy-all:$groovyVersion")
testCompile("org.python:jython-standalone:2.5.2")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.scripting'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.*;version="[3.0.5, 4.0.0)"',
+ 'org.w3c.dom.*;version="0"',
+ 'javax.script.*;version="0"'
+ ]
+ }
}
project('spring-integration-security') {
@@ -438,6 +638,20 @@ project('spring-integration-security') {
exclude group: 'org.springframework', module: 'spring-support'
}
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.security'
+ importTemplate += [
+ 'org.aopalliance.*;version="[1.0.0, 2.0.0)"',
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.aop.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.security.*;version="[3.0.3, 4.0.0)"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-sftp') {
@@ -451,6 +665,21 @@ project('spring-integration-sftp') {
compile("javax.activation:activation:$javaxActivationVersion") { optional = true }
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.sftp'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'com.jcraft.jsch.*;version="[0.1.41, 0.1.50)"',
+ 'javax.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-stream') {
@@ -459,6 +688,16 @@ project('spring-integration-stream') {
compile project(":spring-integration-core")
compile "org.springframework:spring-context:$springVersion"
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.stream'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-test') {
@@ -470,6 +709,19 @@ project('spring-integration-test') {
compile "org.springframework:spring-context:$springVersion"
compile "org.springframework:spring-test:$springVersion"
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.test'
+ importTemplate += [
+ 'org.apache.tools.ant.*;version="[1.7.0, 2.0.0)"',
+ 'org.springframework.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'junit.framework.*;version="[4.6.0, 4.7.0)"',
+ 'org.junit.*;version="[4.6.0, 4.7.0)"',
+ 'org.mockito.*;version="[1.6.0, 2.0.0)"',
+ 'org.hamcrest.*;version="[1.1.0, 1.1.0]"',
+ 'org.objenesis.*;version="[1.0.0, 2.0.0)"'
+ ]
+ }
}
project('spring-integration-twitter') {
@@ -489,6 +741,25 @@ project('spring-integration-twitter') {
compile("javax.activation:activation:$javaxActivationVersion") { optional = true }
testCompile project(":spring-integration-test")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.twitter'
+ importTemplate += [
+ 'org.aopalliance.*;version="[1.0.0, 2.0.0)"',
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.aop.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.social.*;version="[1.0.0, 1.1.0)"',
+ 'org.springframework.security.crypto.*;version="[3.1.0, 3.2.0)"',
+ 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'javax.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
}
project('spring-integration-ws') {
@@ -500,8 +771,8 @@ project('spring-integration-ws') {
compile "org.springframework:spring-web:$springVersion"
compile ("org.springframework.ws:spring-ws-core:$springWsVersion") {
exclude group: 'org.springframework', module: 'spring-webmvc'
- exclude group: 'org.springframework', module: 'spring-web'
- exclude group: 'org.springframework', module: 'spring-context-support'
+ exclude group: 'org.springframework', module: 'spring-web'
+ exclude group: 'org.springframework', module: 'spring-context-support'
}
compile("javax.xml.soap:saaj-api:1.3") {
optional = true
@@ -513,6 +784,25 @@ project('spring-integration-ws') {
testCompile "stax:stax-api:1.0.1"
testCompile "xstream:xstream:1.2.2"
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.ws'
+ importTemplate += [
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.core.convert;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.web.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.oxm;version="[1.5.9, 3.1.0)"',
+ 'org.springframework.ws.*;version="[2.0.0, 2.1.0)"',
+ 'org.springframework.xml.*;version="[1.5.9, 2.1.0)"',
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.w3c.dom.*;version="0"',
+ 'javax.xml.*;version="0"'
+ ]
+ }
// suppress saaj path warnings
[compileJava,compileTestJava]*.options*.compilerArgs = ["${xLintArg},-path"]
@@ -525,13 +815,30 @@ project('spring-integration-xml') {
compile "org.springframework:spring-context:$springVersion"
compile "org.springframework:spring-oxm:$springVersion"
compile ("org.springframework.ws:spring-xml:$springWsVersion") {
- exclude group: 'org.springframework', module: 'spring-beans'
- exclude group: 'org.springframework', module: 'spring-core'
+ exclude group: 'org.springframework', module: 'spring-beans'
+ exclude group: 'org.springframework', module: 'spring-core'
}
compile("javax.activation:activation:$javaxActivationVersion") { optional = true }
testCompile project(":spring-integration-test")
testCompile "xmlunit:xmlunit:1.3"
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.xml'
+ importTemplate += [
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.expression.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.oxm;version="[1.5.9, 3.1.0)";resolution:=optional',
+ 'org.springframework.xml.*;version="[1.5.9, 2.1.0)"',
+ 'org.apache.commons.logging.*;version="[1.0, 2.0)"',
+ 'org.w3c.dom.*;version="0"',
+ 'org.xml.sax.*;version="0"',
+ 'javax.xml.*;version="0"'
+ ]
+ }
}
project('spring-integration-xmpp') {
@@ -545,17 +852,236 @@ project('spring-integration-xmpp') {
testCompile project(":spring-integration-test")
testCompile project(":spring-integration-stream")
}
+ bundlor {
+ bundleSymbolicName = 'org.springframework.integration.xmpp'
+ importTemplate += [
+ 'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
+ 'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+ 'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.context;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.core.*;version="[3.0.5, 4.0.0)"',
+ 'org.springframework.util;version="[3.0.5, 4.0.0)"',
+ 'org.jivesoftware.*;version="[3.0.5, 4.0.0)"',
+ 'javax.*;version="0"',
+ 'org.w3c.dom.*;version="0"'
+ ]
+ }
// suppress smack path warnings
[compileJava,compileTestJava]*.options*.compilerArgs = ["${xLintArg},-path"]
}
-// -----------------------------------------------------------------------------
-// Configuration for the docs subproject
-// -----------------------------------------------------------------------------
-project('docs') {
- apply from: "$buildSrcDir/docs.gradle"
+apply plugin: 'docbook-reference'
+
+reference {
+ sourceDir = file('src/reference/docbook')
+}
+
+task api(type: Javadoc) {
+ group = 'Documentation'
+ description = 'Generates aggregated Javadoc API documentation.'
+ options.overview = 'src/api/overview.html'
+ options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
+ source subprojects.collect { project ->
+ project.sourceSets.main.allJava
+ }
+ destinationDir = new File(buildDir, "api")
+ classpath = files(subprojects.collect { project ->
+ project.sourceSets.main.compileClasspath
+ })
+}
+
+task schemaZip(type: Zip) {
+ group = 'Distribution'
+ classifier = 'schema'
+ description = "Builds -${classifier} archive containing all " +
+ "XSDs for deployment at static.springframework.org/schema."
+
+ subprojects.each { subproject ->
+ def Properties schemas = new Properties();
+ def shortName = subproject.name.replaceFirst("${rootProject.name}-", '')
+ if (subproject.name.endsWith("-core")) {
+ shortName = ''
+ }
+
+ subproject.sourceSets.main.resources.find {
+ it.path.endsWith('META-INF/spring.schemas')
+ }?.withInputStream { schemas.load(it) }
+
+ for (def key : schemas.keySet()) {
+ File xsdFile = subproject.sourceSets.main.resources.find {
+ it.path.endsWith(schemas.get(key))
+ }
+ assert xsdFile != null
+ into ("integration/${shortName}") {
+ from xsdFile.path
+ }
+ }
+ }
+}
+
+task docsZip(type: Zip) {
+ group = 'Distribution'
+ classifier = 'docs'
+ description = "Builds -${classifier} archive containing api and reference " +
+ "for deployment at static.springframework.org/spring-integration/docs."
+
+ from('src/dist') {
+ include 'changelog.txt'
+ }
+
+ from (api) {
+ into 'api'
+ }
+
+ from (reference) {
+ into 'reference'
+ }
+}
+
+task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
+ group = 'Distribution'
+ classifier = 'dist'
+ description = "Builds -${classifier} archive, containing all jars and docs, " +
+ "suitable for community download page."
+
+ baseDir = "${project.name}-${project.version}";
+
+ from('src/dist') {
+ include 'readme.txt'
+ include 'license.txt'
+ include 'notice.txt'
+ into "${baseDir}"
+ }
+
+ from(zipTree(docsZip.archivePath)) {
+ into "${baseDir}/docs"
+ }
+
+ from(zipTree(schemaZip.archivePath)) {
+ into "${baseDir}/schema"
+ }
+
+ subprojects.each { subproject ->
+ into ("${baseDir}/libs") {
+ from subproject.jar
+ from subproject.sourcesJar
+ from subproject.javadocJar
+ }
+ }
+}
+
+// Create an optional "with dependencies" distribution.
+// Not published by default; only for use when building from source.
+task depsZip(type: Zip, dependsOn: distZip) { zipTask ->
+ group = 'Distribution'
+ classifier = 'dist-with-deps'
+ description = "Builds -${classifier} archive, containing everything " +
+ "in the -${distZip.classifier} archive plus all dependencies."
+
+ from zipTree(distZip.archivePath)
+
+ gradle.taskGraph.whenReady { taskGraph ->
+ if (taskGraph.hasTask(":${zipTask.name}")) {
+ def projectNames = rootProject.subprojects*.name
+ def artifacts = new HashSet()
+ subprojects.each { subproject ->
+ subproject.configurations.runtime.resolvedConfiguration.resolvedArtifacts.each { artifact ->
+ def dependency = artifact.moduleVersion.id
+ if (!projectNames.contains(dependency.name)) {
+ artifacts << artifact.file
+ }
+ }
+ }
+
+ zipTask.from(artifacts) {
+ into "${distZip.baseDir}/deps"
+ }
+ }
+ }
+}
+
+artifacts {
+ archives distZip
+ archives docsZip
+ archives schemaZip
+}
+
+task dist(dependsOn: assemble) {
+ group = 'Distribution'
+ description = 'Builds -dist, -docs and -schema distribution archives.'
+}
+
+task wrapper(type: Wrapper) {
+ description = 'Generates gradlew[.bat] scripts'
+ gradleVersion = '1.0-milestone-6'
+ jarFile = '.wrapper/gradle-wrapper.jar'
}
-apply from: "$buildSrcDir/dist.gradle"
-apply from: "$buildSrcDir/checks.gradle"
+def customizePom(def pom, def gradleProject) {
+ pom.whenConfigured { generatedPom ->
+ // respect 'optional' and 'provided' dependencies
+ def deps = gradleProject.configurations.runtime.allDependencies
+ def optionalDeps = deps.findAll { dep ->
+ dep.asDynamicObject.hasProperty('optional') && dep.optional
+ }
+ def providedDeps = deps.findAll { dep ->
+ dep.asDynamicObject.hasProperty('provided') && dep.provided
+ }
+ generatedPom.dependencies.each { mavenDep ->
+ mavenDep.optional = optionalDeps.any { optionalDep ->
+ optionalDep.group == mavenDep.groupId &&
+ optionalDep.name == mavenDep.artifactId &&
+ optionalDep.version == mavenDep.version
+ }
+ boolean isProvided = providedDeps.any { providedDep ->
+ providedDep.group == mavenDep.groupId &&
+ providedDep.name == mavenDep.artifactId &&
+ providedDep.version == mavenDep.version
+ }
+ if (isProvided) {
+ mavenDep.scope = 'provided'
+ }
+ }
+
+ // eliminate test-scoped dependencies (no need in maven central poms)
+ generatedPom.dependencies.removeAll { dep ->
+ dep.scope == 'test'
+ }
+
+ // add all items necessary for maven central publication
+ generatedPom.project {
+ name = gradleProject.description
+ description = gradleProject.description
+ url = 'https://github.com/SpringSource/spring-integration'
+ organization {
+ name = 'SpringSource'
+ url = 'http://springsource.org'
+ }
+ licenses {
+ license {
+ name 'The Apache Software License, Version 2.0'
+ url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ distribution 'repo'
+ }
+ }
+ scm {
+ url = 'https://github.com/SpringSource/spring-integration'
+ connection = 'scm:git:git://github.com/SpringSource/spring-integration'
+ developerConnection = 'scm:git:git://github.com/SpringSource/spring-integration'
+ }
+ developers {
+ developer {
+ id = 'markfisher'
+ name = 'Mark Fisher'
+ email = 'markfisher@vmware.com'
+ }
+ developer {
+ id = 'olegz'
+ name = 'Oleg Zhurakousky'
+ email = 'ozhurakousky@vmware.com'
+ }
+ }
+ }
+ }
+}
1  buildSrc
@@ -1 +0,0 @@
-Subproject commit db443164bf02a122f771a2bf4ed72df932779652
36 docs/src/info/readme.txt
View
@@ -1,36 +0,0 @@
-SPRING INTEGRATION 2.1.0 Release Candidate 2
------------------------------------------------------------
-
-To find out what has changed since any earlier releases, see 'changelog.txt'.
-
-Please consult the documentation located within the 'docs/reference' directory
-of this release and also visit the official Spring Integration home at
-http://www.springsource.org/spring-integration
-
-There you will find links to the forum, issue tracker, and several other resources.
-
-To check out the project and build from source, do the following:
-
- git clone --recursive git://github.com/SpringSource/spring-integration.git
- cd spring-integration
- ./gradlew build
-
-To generate Eclipse metadata (.classpath and .project files), do the following:
-
- ./gradlew eclipse
-
-Once complete, you may then import projects into Eclipse as usual:
-
- File->Import->Existing projects into workspace
-
-and point to the 'spring-integration' root directory. All projects should import free of errors.
-
-To generate IDEA metadata (.iml and .ipr files), do the following:
-
- ./gradlew idea
-
-To build the JavaDoc, do the following from within the root directory:
-
- ./gradlew :docs:api
-
-The result will be available in 'docs/build/api'.
35 docs/src/reference/resources/css/highlight.css
View
@@ -1,35 +0,0 @@
-/*
- code highlight CSS resemblign the Eclipse IDE default color schema
- @author Costin Leau
-*/
-
-.hl-keyword {
- color: #7F0055;
- font-weight: bold;
-}
-
-.hl-comment {
- color: #3F5F5F;
- font-style: italic;
-}
-
-.hl-multiline-comment {
- color: #3F5FBF;
- font-style: italic;
-}
-
-.hl-tag {
- color: #3F7F7F;
-}
-
-.hl-attribute {
- color: #7F007F;
-}
-
-.hl-value {
- color: #2A00FF;
-}
-
-.hl-string {
- color: #2A00FF;
-}
421 docs/src/reference/resources/css/html.css
View
@@ -1,421 +0,0 @@
-body {
- text-align: justify;
- margin-right: 2em;
- margin-left: 2em;
-}
-
-a,
- a[accesskey^
-
-=
-"h"
-]
-,
-a[accesskey^
-
-=
-"n"
-]
-,
-a[accesskey^
-
-=
-"u"
-]
-,
-a[accesskey^
-
-=
-"p"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
-font-size:
-
-12
-px
-
-;
-color: #003399
-
-;
-}
-
-a:active {
- color: #003399;
-}
-
-a:visited {
- color: #888888;
-}
-
-p {
- font-family: Verdana, Arial, sans-serif;
-}
-
-dt {
- font-family: Verdana, Arial, sans-serif;
- font-size: 12px;
-}
-
-p, dl, dt, dd, blockquote {
- color: #000000;
- margin-bottom: 3px;
- margin-top: 3px;
- padding-top: 0px;
-}
-
-ol, ul, p {
- margin-top: 6px;
- margin-bottom: 6px;
-}
-
-p, blockquote {
- font-size: 90%;
-}
-
-p.releaseinfo {
- font-size: 100%;
- font-weight: bold;
- font-family: Verdana, Arial, helvetica, sans-serif;
- padding-top: 10px;
-}
-
-p.pubdate {
- font-size: 120%;
- font-weight: bold;
- font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-td {
- font-size: 80%;
-}
-
-td, th, span {
- color: #000000;
-}
-
-td[width^
-
-=
-"40%"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
-font-size:
-
-12
-px
-
-;
-color: #003399
-
-;
-}
-
-table[summary^
-
-=
-"Navigation header"
-]
-tbody tr th[colspan^
-
-=
-"3"
-]
-{
-font-family: Verdana, Arial, helvetica, sans-serif
-
-;
-}
-
-blockquote {
- margin-right: 0px;
-}
-
-h1, h2, h3, h4, h6, H6 {
- color: #000000;
- font-weight: 500;
- margin-top: 0px;
- padding-top: 14px;
- font-family: Verdana, Arial, helvetica, sans-serif;
- margin-bottom: 0px;
-}
-
-h2.title {
- font-weight: 800;
- margin-bottom: 8px;
-}
-
-h2.subtitle {
- font-weight: 800;
- margin-bottom: 20px;
-}
-
-.firstname, .surname {
- font-size: 12px;
- font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-table {
- border-collapse: collapse;
- border-spacing: 0;
- border: 1px black;
- empty-cells: hide;
- margin: 10px 0px 30px 50px;
- width: 90%;
-}
-
-div.table {
- margin: 30px 0px 30px 0px;
- border: 1px dashed gray;
- padding: 10px;
-}
-
-div .table-contents table {
- border: 1px solid black;
-}
-
-div.table > p.title {
- padding-left: 10px;
-}
-
-table[summary^
-
-=
-"Navigation footer"
-]
-{
-border-collapse: collapse
-
-;
-border-spacing:
-
-0
-;
-border:
-
-1
-px black
-
-;
-empty-cells: hide
-
-;
-margin:
-
-0
-px
-
-;
-width:
-
-100
-%
-;
-}
-
-table[summary^
-
-=
-"Note"
-]
-,
-table[summary^
-
-=
-"Warning"
-]
-,
-table[summary^
-
-=
-"Tip"
-]
-{
-border-collapse: collapse
-
-;
-border-spacing:
-
-0
-;
-border:
-
-1
-px black
-
-;
-empty-cells: hide
-
-;
-margin:
-
-10
-px
-
-0
-px
-
-10
-px
-
--
-20
-px
-
-;
-width:
-
-100
-%
-;
-}
-
-td {
- padding: 4pt;
- font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-div.warning TD {
- text-align: justify;
-}
-
-h1 {
- font-size: 150%;
-}
-
-h2 {
- font-size: 110%;
-}
-
-h3 {
- font-size: 100%;
- font-weight: bold;
-}
-
-h4 {
- font-size: 90%;
- font-weight: bold;
-}
-
-h5 {
- font-size: 90%;
- font-style: italic;
-}
-
-h6 {
- font-size: 100%;
- font-style: italic;
-}
-
-tt {
- font-size: 110%;
- font-family: "Courier New", Courier, monospace;
- color: #000000;
-}
-
-.navheader, .navfooter {
- border: none;
-}
-
-div.navfooter table {
- border: dashed gray;
- border-width: 1px 1px 1px 1px;
- background-color: #cde48d;
-}
-
-pre {
- font-size: 110%;
- padding: 5px;
- border-style: solid;
- border-width: 1px;
- border-color: #CCCCCC;
- background-color: #f3f5e9;
-}
-
-ul, ol, li {
- list-style: disc;
-}
-
-hr {
- width: 100%;
- height: 1px;
- background-color: #CCCCCC;
- border-width: 0px;
- padding: 0px;
-}
-
-.variablelist {
- padding-top: 10px;
- padding-bottom: 10px;
- margin: 0;
-}
-
-.term {
- font-weight: bold;
-}
-
-.mediaobject {
- padding-top: 30px;
- padding-bottom: 30px;
-}
-
-.legalnotice {
- font-family: Verdana, Arial, helvetica, sans-serif;
- font-size: 12px;
- font-style: italic;
-}
-
-.sidebar {
- float: right;
- margin: 10px 0px 10px 30px;
- padding: 10px 20px 20px 20px;
- width: 33%;
- border: 1px solid black;
- background-color: #F4F4F4;
- font-size: 14px;
-}
-
-.property {
- font-family: "Courier New", Courier, monospace;
-}
-
-a code {
- font-family: Verdana, Arial, monospace;
- font-size: 12px;
-}
-
-td code {
- font-size: 110%;
-}
-
-div.note * td,
- div.tip * td,
- div.warning * td,
- div.calloutlist * td {
- text-align: justify;
- font-size: 100%;
-}
-
-.programlisting .interfacename,
- .programlisting .literal,
- .programlisting .classname {
- font-size: 95%;
-}
-
-.title .interfacename,
- .title .literal,
- .title .classname {
- font-size: 130%;
-}
-
-/* everything in a <lineannotation/> is displayed in a coloured, comment-like font */
-.programlisting * .lineannotation,
- .programlisting * .lineannotation * {
- color: green;
-}
69 docs/src/reference/resources/css/manual.css
View
@@ -1,69 +0,0 @@
-@IMPORT url("highlight.css");
-
-html {
- padding: 0pt;
- margin: 0pt;
-}
-
-body {
- margin-left: 10%;
- margin-right: 10%;
- font-family: Arial, Sans-serif;
-}
-
-div {
- margin: 0pt;
-}
-
-p {
- text-align: justify;
-}
-
-hr {
- border: 1px solid gray;
- background: gray;
-}
-
-h1,h2,h3,h4 {
- color: #234623;
- font-family: Arial, Sans-serif;
-}
-
-pre {
- line-height: 1.0;
- color: black;
-}
-
-pre.programlisting {
- font-size: 10pt;
- padding: 7pt 3pt;
- border: 1pt solid black;
- background: #eeeeee;
- clear: both;
-}
-
-div.table {
- margin: 1em;
- padding: 0.5em;
- text-align: center;
-}
-
-div.table table {
- display: table;
- width: 100%;
-}
-
-div.table td {
- padding-left: 7px;
- padding-right: 7px;
-}
-
-.sidebar {
- float: right;
- margin: 10px 0 10px 30px;
- padding: 10px 20px 20px 20px;
- width: 33%;
- border: 1px solid black;
- background-color: #F4F4F4;
- font-size: 14px;
-}
99 docs/src/reference/resources/css/stylesheet.css
View
@@ -1,99 +0,0 @@
-@IMPORT url("highlight.css");
-
-html {
- padding: 0pt;
- margin: 0pt;
-}
-
-body {
- margin-left: 10%;
- margin-right: 10%;
- font-family: Arial, Sans-serif;
-}
-
-div {
- margin: 0pt;
-}
-
-p {
- text-align: justify;
-}
-
-hr {
- border: 1px solid gray;
- background: gray;
-}
-
-h1,h2,h3,h4 {
- color: #234623;
- font-family: Arial, Sans-serif;
-}
-
-pre {
- line-height: 1.0;
- color: black;
-}
-
-pre.programlisting {
- font-size: 10pt;
- padding: 7pt 3pt;
- border: 1pt solid black;
- background: #eeeeee;
- clear: both;
-}
-
-div.table {
- margin: 1em;
- padding: 0.5em;
- text-align: center;
-}
-
-div.table table {
- display: table;
- width: 100%;
-}
-
-div.table td {
- padding-left: 7px;
- padding-right: 7px;
-}
-
-.sidebar {
- float: right;
- margin: 10px 0 10px 30px;
- padding: 10px 20px 20px 20px;
- width: 33%;
- border: 1px solid black;
- background-color: #F4F4F4;
- font-size: 14px;
-}
-
-.mediaobject {
- padding-top: 30px;
- padding-bottom: 30px;
-}
-
-.legalnotice {
- font-family: Verdana, Arial, helvetica, sans-serif;
- font-size: 12px;
- font-style: italic;
-}
-
-p.releaseinfo {
- font-size: 100%;
- font-weight: bold;
- font-family: Verdana, Arial, helvetica, sans-serif;
- padding-top: 10px;
-}
-
-p.pubdate {
- font-size: 120%;
- font-weight: bold;
- font-family: Verdana, Arial, helvetica, sans-serif;
-}
-
-span.productname {
- font-size: 200%;
- font-weight: bold;
- font-family: Verdana, Arial, helvetica, sans-serif;
-}
BIN  docs/src/reference/resources/images/admon/caution.png
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/admon/important.png
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/admon/note-spr.jpg
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/admon/note.png
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/admon/tip.png
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/admon/warning.png
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/callouts/1.gif
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/callouts/1.png
View
Deleted file not rendered
15 docs/src/reference/resources/images/callouts/1.svg
View
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg">
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M10.428,10.411h0.56c3.78,0,4.788-1.96,4.872-3.444h3.22v19.88h-3.92V13.154h-4.732V10.411z"/>
- </g>
-</g>
-</svg>
BIN  docs/src/reference/resources/images/callouts/10.gif
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/callouts/10.png
View
Deleted file not rendered
18 docs/src/reference/resources/images/callouts/10.svg
View
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg">
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.815,10.758h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.04h-3.36V13.11H3.815V10.758z"/>
- <path style="fill:#FFFFFF;" d="M22.175,7.806c4.009,0,5.904,2.76,5.904,8.736c0,5.975-1.896,8.76-5.904,8.76
- c-4.008,0-5.904-2.785-5.904-8.76C16.271,10.566,18.167,7.806,22.175,7.806z M22.175,22.613c1.921,0,2.448-1.68,2.448-6.071
- c0-4.393-0.527-6.049-2.448-6.049c-1.92,0-2.448,1.656-2.448,6.049C19.727,20.934,20.255,22.613,22.175,22.613z"/>
- </g>
-</g>
-</svg>
BIN  docs/src/reference/resources/images/callouts/11.gif
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/callouts/11.png
View
Deleted file not rendered
16 docs/src/reference/resources/images/callouts/11.svg
View
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg">
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M5.209,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H5.209V10.412z"/>
- <path style="fill:#FFFFFF;" d="M18.553,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.359V12.764h-4.056V10.412z"/>
- </g>
-</g>
-</svg>
BIN  docs/src/reference/resources/images/callouts/12.gif
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/callouts/12.png
View
Deleted file not rendered
18 docs/src/reference/resources/images/callouts/12.svg
View
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg">
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M4.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H4.813V10.412z"/>
- <path style="fill:#FFFFFF;" d="M17.316,13.484c0-5.545,4.056-6.024,5.568-6.024c3.265,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.553,5.544c-2.256,1.584-3.432,2.353-3.815,3.145h7.392V24.5h-11.64c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.353-2.424c-2.352,0-2.423,1.944-2.447,3.192H17.316z"/>
- </g>
-</g>
-</svg>
BIN  docs/src/reference/resources/images/callouts/13.gif
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/callouts/13.png
View
Deleted file not rendered
20 docs/src/reference/resources/images/callouts/13.svg
View
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg">
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H3.813V10.412z"/>
- <path style="fill:#FFFFFF;" d="M20.611,14.636h0.529c1.008,0,2.855-0.096,2.855-2.304c0-0.624-0.288-2.185-2.137-2.185
- c-2.303,0-2.303,2.185-2.303,2.784h-3.12c0-3.191,1.8-5.472,5.64-5.472c2.279,0,5.279,1.152,5.279,4.752
- c0,1.728-1.08,2.808-2.039,3.24V15.5c0.6,0.168,2.568,1.056,2.568,3.96c0,3.216-2.377,5.496-5.809,5.496
- c-1.607,0-5.928-0.36-5.928-5.688h3.288l-0.024,0.024c0,0.912,0.24,2.976,2.496,2.976c1.344,0,2.52-0.911,2.52-2.808
- c0-2.328-2.256-2.424-3.816-2.424V14.636z"/>
- </g>
-</g>
-</svg>
BIN  docs/src/reference/resources/images/callouts/14.gif
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/callouts/14.png
View
Deleted file not rendered
17 docs/src/reference/resources/images/callouts/14.svg
View
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg">
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M4.146,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H4.146V10.412z"/>
- <path style="fill:#FFFFFF;" d="M28.457,20.732h-1.896V24.5h-3.36v-3.768h-6.72v-2.904L22.746,7.46h3.815v10.656h1.896V20.732z
- M23.201,18.116c0-4.128,0.072-6.792,0.072-7.32h-0.048l-4.272,7.32H23.201z"/>
- </g>
-</g>
-</svg>
BIN  docs/src/reference/resources/images/callouts/15.gif
View
Deleted file not rendered
BIN  docs/src/reference/resources/images/callouts/15.png
View
Diff not rendered
19 docs/src/reference/resources/images/callouts/15.svg
View
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg">
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.479,11.079h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.04h-3.36V13.43H3.479V11.079z"/>
- <path style="fill:#FFFFFF;" d="M19.342,14.943c0.625-0.433,1.392-0.937,3.048-0.937c2.279,0,5.16,1.584,5.16,5.496
- c0,2.328-1.176,6.121-6.192,6.121c-2.664,0-5.376-1.584-5.544-5.016h3.36c0.144,1.391,0.888,2.326,2.376,2.326
- c1.607,0,2.544-1.367,2.544-3.191c0-1.512-0.72-3.047-2.496-3.047c-0.456,0-1.608,0.023-2.256,1.223l-3-0.143l1.176-9.361h9.36
- v2.832h-6.937L19.342,14.943z"/>
- </g>
-</g>
-</svg>
20 docs/src/reference/resources/images/callouts/16.svg
View
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg">
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H3.813V10.412z"/>
- <path style="fill:#FFFFFF;" d="M24.309,11.78c-0.097-0.96-0.721-1.633-1.969-1.633c-2.184,0-2.688,2.496-2.808,4.704L19.58,14.9
- c0.456-0.624,1.296-1.416,3.191-1.416c3.529,0,5.209,2.712,5.209,5.256c0,3.72-2.28,6.216-5.568,6.216
- c-5.16,0-6.168-4.32-6.168-8.568c0-3.24,0.432-8.928,6.336-8.928c0.695,0,2.641,0.264,3.48,1.104
- c0.936,0.912,1.271,1.416,1.584,3.217H24.309z M22.172,16.172c-1.271,0-2.568,0.792-2.568,2.928c0,1.849,1.056,3.168,2.664,3.168
- c1.225,0,2.353-0.936,2.353-3.239C24.62,16.868,23.229,16.172,22.172,16.172z"/>
- </g>
-</g>
-</svg>
17 docs/src/reference/resources/images/callouts/17.svg
View
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg">
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>