diff --git a/build-spring-integration/build.xml b/build-spring-integration/build.xml index 0178cd7354..b6a8e2f39a 100644 --- a/build-spring-integration/build.xml +++ b/build-spring-integration/build.xml @@ -14,7 +14,6 @@ - \ No newline at end of file diff --git a/build-spring-integration/package-bundle.xml b/build-spring-integration/package-bundle.xml index 333d067cc2..a449ccf174 100644 --- a/build-spring-integration/package-bundle.xml +++ b/build-spring-integration/package-bundle.xml @@ -5,6 +5,7 @@ + diff --git a/build-spring-integration/publish-top-level.xml b/build-spring-integration/publish-top-level.xml index 213a81edeb..8bfb2ccb82 100644 --- a/build-spring-integration/publish-top-level.xml +++ b/build-spring-integration/publish-top-level.xml @@ -1,6 +1,6 @@ - + diff --git a/build.properties b/build.properties index a6240a0898..3608c4ec40 100644 --- a/build.properties +++ b/build.properties @@ -4,3 +4,4 @@ natural.name=spring-integration project.key=INT ivy.cache.dir=${basedir}/../ivy-cache integration.repo.dir=${basedir}/../integration-repo +javadoc.exclude.package.names=org/springframework/integration/samples/** \ No newline at end of file diff --git a/spring-integration-adapters/.classpath b/spring-integration-adapters/.classpath index 38dd0ea8e0..9e143863fb 100644 --- a/spring-integration-adapters/.classpath +++ b/spring-integration-adapters/.classpath @@ -3,25 +3,24 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/spring-integration-adapters/ivy.xml b/spring-integration-adapters/ivy.xml index befea0f5bb..c6158c09d7 100644 --- a/spring-integration-adapters/ivy.xml +++ b/spring-integration-adapters/ivy.xml @@ -20,20 +20,21 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-integration-core/.classpath b/spring-integration-core/.classpath index 8c205494b7..830ee0728e 100644 --- a/spring-integration-core/.classpath +++ b/spring-integration-core/.classpath @@ -3,13 +3,13 @@ - - - - - - - - + + + + + + + + diff --git a/spring-integration-core/ivy.xml b/spring-integration-core/ivy.xml index bb502f277e..5cbf8d164c 100644 --- a/spring-integration-core/ivy.xml +++ b/spring-integration-core/ivy.xml @@ -20,9 +20,9 @@ - - - + + + \ No newline at end of file diff --git a/spring-integration-reference/css/html/stylesheet.css b/spring-integration-reference/css/html/stylesheet.css deleted file mode 100644 index 54e4ba762c..0000000000 --- a/spring-integration-reference/css/html/stylesheet.css +++ /dev/null @@ -1,56 +0,0 @@ -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 { - 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; -} - -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; -} diff --git a/spring-integration-reference/src/adapters.xml b/spring-integration-reference/src/adapters.xml index 1554b5789e..90f790bd46 100644 --- a/spring-integration-reference/src/adapters.xml +++ b/spring-integration-reference/src/adapters.xml @@ -1,4 +1,5 @@ + Channel Adapters @@ -36,7 +37,7 @@ a reference to a MessageChannel instance. The adapter accepts additional properties such as: period, initialDelay, maxMessagesPerTask, and sendTimeout. The following example defines a JMS source adapter that polls every 5 seconds and then sends to the "exampleChannel": - + @@ -50,7 +51,7 @@ Destination (or 'destinationName'). The following example defines a JMS message-driven source adapter that receives from the JMS queue called "exampleQueue" and then sends to the Spring Integration channel named "exampleChannel": - + @@ -78,7 +79,7 @@ However, since it is adapting a MessageChannel, there is no need to specify the serviceInterface. Likewise, the serviceName is automatically generated based on the channel name. Therefore, creating the adapter is as simple as providing a reference - to its channel: RmiSourceAdapter rmiSourceAdapter = new RmiSourceAdapter(channel); + to its channel: RmiSourceAdapter rmiSourceAdapter = new RmiSourceAdapter(channel); @@ -87,7 +88,7 @@ is already known, the only required information is the URL. The URL should include the host, port (default is '1099'), and 'serviceName'. The 'serviceName' must match that created by the RmiSourceAdapter (the prefix is available as a constant). - String url = "http://somehost:1099/" + RmiSourceAdapter.SERVICE_NAME_PREFIX + "someChannel"; + String url = "http://somehost:1099/" + RmiSourceAdapter.SERVICE_NAME_PREFIX + "someChannel"; RmiTargetAdapter rmiTargetAdapter = new RmiTargetAdapter(url); @@ -101,7 +102,7 @@ RmiTargetAdapter rmiTargetAdapter = new RmiTargetAdapter(url); HandlerMapping. For example, the following would be exposed at the path "http://somehost/path-mapped-to-dispatcher-servlet/httpInvokerAdapter" when a simple BeanNameUrlHandlerMapping strategy is enabled: - ]]> @@ -117,13 +118,13 @@ RmiTargetAdapter rmiTargetAdapter = new RmiTargetAdapter(url); The FileSourceAdapter extends the generic PollingSourceAdapter (just as the polling JMS adapter does). It requires the following constructor arguments: - public FileSourceAdapter(File directory, MessageChannel channel, int period) + public FileSourceAdapter(File directory, MessageChannel channel, int period) Optional properties include 'initialDelay' and 'maxMessagesPerTask'. The FileTargetAdapter constructor only requires the 'directory' argument. The target adapter also accepts an implementation of the FileNameGenerator strategy that - defines the following method: String generateFileName(Message message) + defines the following method: String generateFileName(Message message)
@@ -132,7 +133,7 @@ RmiTargetAdapter rmiTargetAdapter = new RmiTargetAdapter(url); To poll a directory with FTP, configure an instance of FtpSourceAdapter. The adapter expects a number of properties for connecting to the FTP server (as shown below) as well as the 'channel' and the 'period' for polling. For example, the following adapter would poll every 30 seconds: - @@ -157,12 +158,12 @@ RmiTargetAdapter rmiTargetAdapter = new RmiTargetAdapter(url); The adapter also delegates to a MailHeaderGenerator for providing the mail's properties, such as the recipients (TO, CC, and BCC), the from/reply-to, and the subject. - message); }]]> The default implementation will look for attributes in the MessageHeader with the following constants defining the keys: - MailAttributeKeys.SUBJECT + MailAttributeKeys.SUBJECT MailAttributeKeys.TO MailAttributeKeys.CC MailAttributeKeys.BCC @@ -173,7 +174,7 @@ MailAttributeKeys.REPLY_TO A static implementation is also available out-of-the-box and may be useful for testing. However, when customizing, the properties would typically be generated dynamically based on the message itself. The following is an example of a configured mail adapter. - @@ -189,7 +190,7 @@ MailAttributeKeys.REPLY_TO String or javax.xml.transform.Source as the message payload. The latter provides support for any implementation of the Marshaller and Unmarshaller interfaces. Both require the URI of the Web Service to be - called.simpleAdapter = new SimpleWebServiceTargetAdapter(uri); + called.simpleAdapter = new SimpleWebServiceTargetAdapter(uri); marshallingAdapter = new MarshallingWebServiceTargetAdapter(uri, marshaller); diff --git a/spring-integration-reference/src/configuration.xml b/spring-integration-reference/src/configuration.xml index 4c22640f2d..00ea716995 100644 --- a/spring-integration-reference/src/configuration.xml +++ b/spring-integration-reference/src/configuration.xml @@ -1,4 +1,5 @@ + Configuration @@ -27,7 +28,7 @@ To enable Spring Integration's namespace support within your Spring configuration files, add the following namespace reference and schema mapping in your top-level 'beans' element: - xmlns:integration="http://www.springframework.org/schema/integration"<beans:beans xmlns="http://www.springframework.org/schema/integration"<beans:beans xmlns="http://www.springframework.org/schema/integration"xmlns:beans="http://www.springframework.org/schema/beans"Configuring Message Channels To create a Message Channel instance, you can use the generic 'channel' element: - <channel id="exampleChannel"/> + <channel id="exampleChannel"/> The default channel type is Point to Point. To create a Publish Subscribe channel, provide a value of true for the 'publish-subscribe' attribute of the channel element: - <channel id="exampleChannel" publish-subscribe="true"/> + <channel id="exampleChannel" publish-subscribe="true"/> When the MessageBus detects and registers channels, it will establish a dispatcher for each channel. The default dispatcher settings were previously displayed in . To customize these settings for a particular channel, add the 'dispatcher-policy' sub-element and provide one or more of the attributes shown below: - + Datatype Channel that only accepts messages containing a certain payload type, provide the fully-qualified class name in the channel element's datatype attribute: - ]]> + ]]> Note that the type check passes for any type that is assignable to the channel's datatype. In other words, the "numberChannel" above would accept messages whose payload is java.lang.Integer or java.lang.Double. Multiple types can be provided as a comma-delimited list: - ]]> + ]]> When using the "channel" element, the creation of the channel instances will be deferred to the ChannelFactory @@ -101,16 +102,16 @@ To specificially create a QueueChannel, use the "queue-channel" element. By using this element, you can also specify the channel's capacity: - <queue-channel id="exampleChannel" capacity="100"/> + <queue-channel id="exampleChannel" capacity="100"/> To create a PriorityChannel, use the "priority-channel" element: - ]]> + ]]> By default, the channel will consult the MessagePriority value in the message's header. However, a custom Comparator reference may be provided instead. Also, the PriorityChannel does support the "datatype" attribute. The following example demonstrates both: - ]]> @@ -119,7 +120,7 @@ more <interceptor> elements can be added as sub-elements of <channel>. Provide the "ref" attribute to reference any Spring-managed object that implements the ChannelInterceptor interface: - + ]]>]]>]]> In general, it is a good idea to define the interceptor implementations in a separate location since they @@ -132,13 +133,13 @@ To create a Message Endpoint instance, use the 'handler-endpoint' element with the 'input-channel' and 'handler' attributes: - <handler-endpoint input-channel="exampleChannel" handler="exampleHandler"/> + <handler-endpoint input-channel="exampleChannel" handler="exampleHandler"/> The configuration above assumes that "exampleHandler" is an actual implementation of the MessageHandler interface as described in . To delegate to an arbitrary method of any object, simply add the "method" attribute. - <handler-endpoint input-channel="exampleChannel" handler="somePojo" method="someMethod"/> + <handler-endpoint input-channel="exampleChannel" handler="somePojo" method="someMethod"/> In either case (MessageHandler or arbitrary object/method), when the handling @@ -151,7 +152,7 @@ 'returnAddress' property at all, then it will fallback to its own 'outputChannelName' property. If neither is available, then a MessageHandlingException will be thrown. To configure the output channel when using the XML namespace, provide the 'output-channel' attribute: - <handler-endpoint input-channel="exampleChannel" + <handler-endpoint input-channel="exampleChannel" handler="somePojo" method="someMethod" output-channel="replyChannel"/> @@ -160,7 +161,7 @@ Endpoints also support MessageSelectors as described in . To configure selectors with namespace support, simply add one or more <selector> sub-elements to the endpoint definition: - + ]]>]]>]]> @@ -170,7 +171,7 @@ endpoint subscriptions for its channel and delegates to a scheduler for managing the tasks that pull messages from the channel and push them to the endpoints. To configure the polling period for an individual endpoint's schedule, provide a 'schedule' sub-element with the 'period' in milliseconds: - + ]]>]]>]]> @@ -188,7 +189,7 @@ consider (the other major factor being the expected volume on the channel to which the endpoint subscribes). To enable concurrency for an endpoint that is configured with the XML namespace support, provide the 'concurrency' sub-element and one or more of the properties shown below: - + ]]>]]>]]> Recall the default concurrency policy values as listed in . @@ -214,12 +215,12 @@ based on the configuration of channels and endpoints. The bus is aware of its host application context, and therefore is also capable of auto-detecting the channels and endpoints. Typically, the MessageBus can be configured with a single empty element: - <message-bus/> + <message-bus/> The Message Bus provides default error handling for its components in the form of a configurable error channel, and the 'message-bus' element accepts a reference with its 'error-channel' attribute: - + ]]> When exceptions occur in an endpoint's execution of its MessageHandler callback, @@ -236,12 +237,12 @@ methods will happen within the handler thread pool and not the dispatcher pool. Finally, the Message Bus is capable of automatically creating channel instances if an endpoint registers a subscription by providing the name of a channel that the bus does not recognize. - ]]> + ]]> The type of channel that gets created automatically by the bus can be customized by using the "channel-factory" element on the "message-bus" definition as in the following example: - + @@ -257,7 +258,7 @@ The most convenient way to configure Channel Adapters is by using the namespace support. The following examples demonstrate the namespace-based configuration of several source and target adapters: - @@ -295,7 +296,7 @@ The next section will describe Spring Integration's support for annotation-driven configuration. To enable those features, add this single element to the XML-based configuration: - <annotation-driven/> + <annotation-driven/>
@@ -308,7 +309,7 @@ annotated class is capable of being registered as an endpoint, and the method-level @Handler annotation indicates that the annotated method is capable of handling a message. - @MessageEndpoint(input="fooChannel") + @MessageEndpoint(input="fooChannel") public class FooService { @Handler @@ -320,7 +321,7 @@ public class FooService { In most cases, the annotated handler method should not require the Message type as its parameter. Instead, the method parameter type can match the message's payload type. - @MessageEndpoint(input="fooChannel") + @MessageEndpoint(input="fooChannel") public class FooService { @Handler @@ -335,15 +336,15 @@ public class FooService { the message header's 'replyChannelName' property will be used if available, and the endpoint's default output is the fallback. To configure the default output for an annotation-driven endpoint, provide the 'output' attribute on the @MessageEndpoint. - @MessageEndpoint(input="exampleChannel", output="replyChannel") + @MessageEndpoint(input="exampleChannel", output="replyChannel") Just as the 'schedule' sub-element and its 'period' attribute can be provided for a namespace-based endpoint, the 'pollPeriod' attribute can be provided on the @MessageEndpoint. - @MessageEndpoint(input="exampleChannel", pollPeriod=3000) + @MessageEndpoint(input="exampleChannel", pollPeriod=3000) Likewise, @Concurrency provides an annotation-based equivalent of the <concurrency/> element: - @MessageEndpoint(input="fooChannel") + @MessageEndpoint(input="fooChannel") @Concurrency(coreSize=5, maxSize=20) public class FooService { @@ -363,7 +364,7 @@ public class FooService { the endpoint will resolve the channel name as it does for the default output. Additionally, the method can return either a single value or a collection. When a collection is returned, the reply message will be sent to multiple channels. To summarize, the following method signatures are all valid. - @Router + @Router public MessageChannel route(Message message) {...} @Router @@ -380,7 +381,7 @@ public List<String> route(Foo payload) {...} message header as either a property or attribute. Rather than requiring use of the Message type as the method parameter, the @Router annotation may also map to either a property or attribute name. - @Router(property="customerType") + @Router(property="customerType") public String route(String customerType) @Router(attribute="orderStatus") @@ -392,7 +393,7 @@ public List<String> route(OrderStatus status) should be a collection of any type. If the returned values are not actual Message objects, then each of them will be sent as the payload of a message. The @Splitter annotation expects a 'channel' attribute that specifies the channel name to which those messages should be sent. - @Splitter(channel="exampleChannel") + @Splitter(channel="exampleChannel") List<LineItem> extractItems(Order order) { return order.getItems() } @@ -401,7 +402,7 @@ List<LineItem> extractItems(Order order) { The @Publisher annotation is a convenience for sending messages with AOP after-returning advice. For example, each time the following method is invoked, its return value will be sent to the "fooChannel": - @@ -410,7 +411,7 @@ public String foo() { Similarly, the @Subscriber annotation triggers the retrieval of messages from a channel, and the payload of each message will then be sent as input to an arbitrary method. This is one of the simplest ways to configure asynchronous, event-driven behavior: - diff --git a/spring-integration-reference/src/core-api.xml b/spring-integration-reference/src/core-api.xml index 299bfb1cee..4592e40aa6 100644 --- a/spring-integration-reference/src/core-api.xml +++ b/spring-integration-reference/src/core-api.xml @@ -1,4 +1,5 @@ + The Core API @@ -9,7 +10,7 @@ be provided as the payload, and each Message also includes a header containing user-extensible properties as key-value pairs. Here is the definition of the Message interface: - public interface Message<T> { + public interface Message<T> { Object getId(); MessageHeader getHeader(); T getPayload(); @@ -70,7 +71,7 @@ The base implementation of the Message interface is GenericMessage<T>, and it provides three constructors: - new GenericMessage<T>(Object id, T payload); + new GenericMessage<T>(Object id, T payload); new GenericMessage<T>(T payload); new GenericMessage<T>(T payload, MessageHeader headerToCopy) When no id is provided, a random unique id will be generated. The constructor that accepts a @@ -82,7 +83,7 @@ new GenericMessage<T>(T payload, MessageHeader headerToCopy) The MessagePriority is only considered when using a PriorityChannel (as described in the next section). It is defined as an enum with five possible values: - public enum MessagePriority { + public enum MessagePriority { HIGHEST, HIGH, NORMAL, @@ -107,7 +108,7 @@ new GenericMessage<T>(T payload, MessageHeader headerToCopy)Message plays the crucial role of encapsulating data, it is the MessageChannel that decouples message producers from message consumers. Spring Integration's MessageChannel interface is defined as follows. - null in the case of a timeout or interrupt. The QueueChannel implementation wraps a queue. It provides a no-argument constructor as well as a constructor that accepts the queue capacity: - public QueueChannel(int capacity) + public QueueChannel(int capacity) Specifying a capacity of 0 will create a "direct-handoff" channel where a sender will block until the channel's receive() method is called. Otherwise a channel that has not reached its capacity limit will store messages in its internal queue, and the send() method will return immediately @@ -148,14 +149,14 @@ new GenericMessage<T>(T payload, MessageHeader headerToCopy)MessageChannels, those channels provide an opportunity for intercepting the send and receive operations. The ChannelInterceptor strategy interface provides methods for each of those operations: - message, MessageChannel channel); void postSend(Message message, MessageChannel channel, boolean sent); boolean preReceive(MessageChannel channel); void postReceive(Message message, MessageChannel channel); }]]> After implementing the interface, registering the interceptor with a channel is just a matter of calling: - channel.addInterceptor(someChannelInterceptor); + channel.addInterceptor(someChannelInterceptor); The methods that return a boolean value can return 'false' to prevent the send or receive operation from proceeding (send would return 'false' and receive would return 'null'). @@ -165,7 +166,7 @@ new GenericMessage<T>(T payload, MessageHeader headerToCopy)void methods are empty, and the boolean methods return true). Therefore, it is often easiest to extend that class and just implement the method(s) that you need as in the following example. - So far we have seen that generic message objects are sent-to and received-from simple channel objects. Here is Spring Integration's callback interface for handling the Messages: - public interface MessageHandler { + public interface MessageHandler { Message<?> handle(Message<?> message); } The handler plays an important role, since it is typically responsible for translating between the generic @@ -210,7 +211,7 @@ new GenericMessage<T>(T payload, MessageHeader headerToCopy)MessageChannels and MessageHandlers. It provides the following methods: - public void registerChannel(String name, MessageChannel channel) + public void registerChannel(String name, MessageChannel channel) public void registerHandler(String name, MessageHandler handler, Subscription subscription) @@ -401,7 +402,7 @@ public void registerHandler(String name, MessageHandler handler, MessageHandler along with its metadata. In fact, the MessageEndpoint does extend the MessageHandler interface. - public interface MessageEndpoint extends MessageHandler { + public interface MessageEndpoint extends MessageHandler { String getName(); Subscription getSubscription(); ConcurrencyPolicy getConcurrencyPolicy(); @@ -421,7 +422,7 @@ public void registerHandler(String name, MessageHandler handler, is hosted by an endpoint and thereby subscribed to a channel. Often it is necessary to provide additional dynamic logic to determine what messages the handler should receive. The MessageSelector strategy interface fulfills that role. - message); }]]> A MessageEndpoint can be configured with zero or more selectors, and will only @@ -429,7 +430,7 @@ public void registerHandler(String name, MessageHandler handler, common selector implementations are provided. For example, the PayloadTypeSelector provides similar functionality to Datatype Channels (as described in ) except that in this case the type-matching can be done by the endpoint rather than the channel. - (123))); assertFalse(selector.accept(new GenericMessage(someObject))); @@ -442,17 +443,17 @@ assertFalse(selector.accept(new GenericMessage(someObject))); Essentially, using a selector provides reactive routing whereas the Datatype Channel and Message Router provide proactive routing. However, selectors accommodate additional uses. For example, the MessageChannel's 'purge' method accepts a selector: - channel.purge(someSelector); + channel.purge(someSelector); There is even a ChannelPurger utility class whose purge operation is a good candidate for Spring's JMX support: - ChannelPurger purger = new ChannelPurger(new ExampleMessageSelector(), channel); + ChannelPurger purger = new ChannelPurger(new ExampleMessageSelector(), channel); purger.purge(); Implementations of MessageSelector might provide opportunities for reuse on channels in addition to endpoints. For that reason, Spring Integration provides a simple selector-wrapping ChannelInterceptor that accepts one or more selectors in its constructor. - MessageSelectingInterceptor interceptor = + MessageSelectingInterceptor interceptor = new MessageSelectingInterceptor(selector1, selector2); channel.addInterceptor(interceptor); diff --git a/spring-integration-reference/src/overview.xml b/spring-integration-reference/src/overview.xml index 45beb1fecf..d2cc243d83 100644 --- a/spring-integration-reference/src/overview.xml +++ b/spring-integration-reference/src/overview.xml @@ -1,4 +1,5 @@ + Spring Integration Overview diff --git a/spring-integration-reference/src/resources.xml b/spring-integration-reference/src/resources.xml index e340567e97..bd4483f0c0 100644 --- a/spring-integration-reference/src/resources.xml +++ b/spring-integration-reference/src/resources.xml @@ -1,4 +1,5 @@ + Additional Resources diff --git a/spring-integration-reference/src/samples.xml b/spring-integration-reference/src/samples.xml index 76b37328af..d81083f98f 100644 --- a/spring-integration-reference/src/samples.xml +++ b/spring-integration-reference/src/samples.xml @@ -1,4 +1,5 @@ + Spring Integration Samples @@ -29,7 +30,7 @@ Here is the XML configuration: - @MessageEndpoint annotation. That annotation extends Spring's "stereotype" annotations (by relying on the @Component meta-annotation), and so all classes carrying the endpoint annotation are capable of being detected by the component-scanner. - - Barista instance but different methods. The 'barista' could have been defined in the XML, but instead the @Component annotation is applied: - CafeDemo 'main' method runs, it will loop 100 times sending a single hot drink and a single cold drink each time. - 0) { context = new FileSystemXmlApplicationContext(args); @@ -163,7 +164,7 @@ public class Barista { However, by configuring the endpoint concurrency, you can dramatically change the results. For example, on my machine, the following single modification causes all 100 hot drinks to be prepared before the 4th cold drink is ready: - + ]]>]]> - - - - - - -]> - + + Spring Integration Reference Manual @@ -40,11 +32,11 @@ - &overview; - &core-api; - &adapters; - &configuration; - &samples; - &resources; + + + + + + \ No newline at end of file diff --git a/spring-integration-reference/styles/html/custom.xsl b/spring-integration-reference/styles/html/custom.xsl deleted file mode 100644 index 7d06277d3d..0000000000 --- a/spring-integration-reference/styles/html/custom.xsl +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - 1 - 0 - 1 - - - - images/ - .gif - - 120 - images/callouts/ - .gif - - - css/stylesheet.css - text/css - book toc,title - - text-align: left - - - - - - - - - - - - - - - - - - - - diff --git a/spring-integration-reference/styles/html/titlepage.xml b/spring-integration-reference/styles/html/titlepage.xml deleted file mode 100644 index 0c0258f725..0000000000 --- a/spring-integration-reference/styles/html/titlepage.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <mediaobject/> - <othercredit/> - <productname/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <hr/> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -</t:templates> diff --git a/spring-integration-reference/styles/pdf/custom.xsl b/spring-integration-reference/styles/pdf/custom.xsl deleted file mode 100644 index 6b565db4d3..0000000000 --- a/spring-integration-reference/styles/pdf/custom.xsl +++ /dev/null @@ -1,429 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you 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. ---> - -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:fo="http://www.w3.org/1999/XSL/Format" - version='1.0'> - - <!-- Use nice graphics for admonitions --> - <xsl:param name="admon.graphics">'1'</xsl:param> - <xsl:param name="admon.graphics.path">@file.prefix@@dbf.xsl@/images/</xsl:param> - <xsl:param name="draft.watermark.image" select="'@file.prefix@@dbf.xsl@/images/draft.png'"/> - <xsl:param name="paper.type" select="'@paper.type@'"/> - - <xsl:param name="page.margin.top" select="'1cm'"/> - <xsl:param name="region.before.extent" select="'1cm'"/> - <xsl:param name="body.margin.top" select="'1.5cm'"/> - - <xsl:param name="body.margin.bottom" select="'1.5cm'"/> - <xsl:param name="region.after.extent" select="'1cm'"/> - <xsl:param name="page.margin.bottom" select="'1cm'"/> - <xsl:param name="title.margin.left" select="'0cm'"/> - -<!--################################################### - Header - ################################################### --> - - <!-- More space in the center header for long text --> - <xsl:attribute-set name="header.content.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$body.font.family"/> - </xsl:attribute> - <xsl:attribute name="margin-left">-5em</xsl:attribute> - <xsl:attribute name="margin-right">-5em</xsl:attribute> - </xsl:attribute-set> - -<!--################################################### - Table of Contents - ################################################### --> - - <xsl:param name="generate.toc"> - book toc,title - </xsl:param> - -<!--################################################### - Custom Header - ################################################### --> - - <xsl:template name="header.content"> - <xsl:param name="pageclass" select="''"/> - <xsl:param name="sequence" select="''"/> - <xsl:param name="position" select="''"/> - <xsl:param name="gentext-key" select="''"/> - - <xsl:variable name="Version"> - <xsl:choose> - <xsl:when test="//productname"> - <xsl:value-of select="//productname"/><xsl:text> </xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>please define productname in your docbook file!</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$sequence='blank'"> - <xsl:choose> - <xsl:when test="$position='center'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:otherwise> - <!-- nop --> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - - <xsl:when test="$pageclass='titlepage'"> - <!-- nop: other titlepage sequences have no header --> - </xsl:when> - - <xsl:when test="$position='center'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:otherwise> - <!-- nop --> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -<!--################################################### - Custom Footer - ################################################### --> - - <xsl:template name="footer.content"> - <xsl:param name="pageclass" select="''"/> - <xsl:param name="sequence" select="''"/> - <xsl:param name="position" select="''"/> - <xsl:param name="gentext-key" select="''"/> - - <xsl:variable name="Version"> - <xsl:choose> - <xsl:when test="//releaseinfo"> - <xsl:value-of select="//releaseinfo"/> - </xsl:when> - <xsl:otherwise> - <!-- nop --> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="Title"> - <xsl:value-of select="//title"/> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$sequence='blank'"> - <xsl:choose> - <xsl:when test="$double.sided != 0 and $position = 'left'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:when test="$double.sided = 0 and $position = 'center'"> - <!-- nop --> - </xsl:when> - - <xsl:otherwise> - <fo:page-number/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - - <xsl:when test="$pageclass='titlepage'"> - <!-- nop: other titlepage sequences have no footer --> - </xsl:when> - - <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'"> - <fo:page-number/> - </xsl:when> - - <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'"> - <fo:page-number/> - </xsl:when> - - <xsl:when test="$double.sided = 0 and $position='right'"> - <fo:page-number/> - </xsl:when> - - <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='left'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='right'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:when test="$double.sided = 0 and $position='left'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:when test="$position='center'"> - <xsl:value-of select="$Title"/> - </xsl:when> - - <xsl:otherwise> - <!-- nop --> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template match="processing-instruction('hard-pagebreak')"> - <fo:block break-before='page'/> - </xsl:template> - -<!--################################################### - Extensions - ################################################### --> - - <!-- These extensions are required for table printing and other stuff --> - <xsl:param name="use.extensions">1</xsl:param> - <xsl:param name="tablecolumns.extension">0</xsl:param> - <xsl:param name="callout.extensions">1</xsl:param> - <xsl:param name="fop.extensions">1</xsl:param> - -<!--################################################### - Paper & Page Size - ################################################### --> - - <!-- Paper type, no headers on blank pages, no double sided printing --> - <xsl:param name="double.sided">0</xsl:param> - <xsl:param name="headers.on.blank.pages">0</xsl:param> - <xsl:param name="footers.on.blank.pages">0</xsl:param> - -<!--################################################### - Fonts & Styles - ################################################### --> - - <xsl:param name="hyphenate">false</xsl:param> - - <!-- Default Font size --> - <xsl:param name="body.font.master">11</xsl:param> - <xsl:param name="body.font.small">8</xsl:param> - - <!-- Line height in body text --> - <xsl:param name="line-height">1.4</xsl:param> - - <!-- Chapter title size --> - <xsl:attribute-set name="chapter.titlepage.recto.style"> - <xsl:attribute name="text-align">left</xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.8"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - </xsl:attribute-set> - - <!-- Why is the font-size for chapters hardcoded in the XSL FO templates? - Let's remove it, so this sucker can use our attribute-set only... --> - <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" - xsl:use-attribute-sets="chapter.titlepage.recto.style"> - <xsl:call-template name="component.title"> - <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/> - </xsl:call-template> - </fo:block> - </xsl:template> - - <!-- Sections 1, 2 and 3 titles have a small bump factor and padding --> - <xsl:attribute-set name="section.title.level1.properties"> - <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.5"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - <xsl:attribute-set name="section.title.level2.properties"> - <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.25"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - <xsl:attribute-set name="section.title.level3.properties"> - <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.0"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - -<!--################################################### - Tables - ################################################### --> - - <!-- Some padding inside tables --> - <xsl:attribute-set name="table.cell.padding"> - <xsl:attribute name="padding-left">4pt</xsl:attribute> - <xsl:attribute name="padding-right">4pt</xsl:attribute> - <xsl:attribute name="padding-top">4pt</xsl:attribute> - <xsl:attribute name="padding-bottom">4pt</xsl:attribute> - </xsl:attribute-set> - - <!-- Only hairlines as frame and cell borders in tables --> - <xsl:param name="table.frame.border.thickness">0.1pt</xsl:param> - <xsl:param name="table.cell.border.thickness">0.1pt</xsl:param> - -<!--################################################### - Labels - ################################################### --> - - <!-- Label Chapters and Sections (numbering) --> - <xsl:param name="chapter.autolabel" select="1"/> - <xsl:param name="section.autolabel" select="1"/> - <xsl:param name="section.autolabel.max.depth" select="1"/> - - <xsl:param name="section.label.includes.component.label" select="1"/> - <xsl:param name="table.footnote.number.format" select="'1'"/> - -<!--################################################### - Programlistings - ################################################### --> - - <!-- Verbatim text formatting (programlistings) --> - <xsl:attribute-set name="monospace.verbatim.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.small * 1.0"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - </xsl:attribute-set> - - <xsl:attribute-set name="verbatim.properties"> - <xsl:attribute name="space-before.minimum">1em</xsl:attribute> - <xsl:attribute name="space-before.optimum">1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">1em</xsl:attribute> - <!-- alef: commented out because footnotes were screwed because of it --> - <!--<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>--> - - <xsl:attribute name="border-color">#444444</xsl:attribute> - <xsl:attribute name="border-style">solid</xsl:attribute> - <xsl:attribute name="border-width">0.1pt</xsl:attribute> - <xsl:attribute name="padding-top">0.5em</xsl:attribute> - <xsl:attribute name="padding-left">0.5em</xsl:attribute> - <xsl:attribute name="padding-right">0.5em</xsl:attribute> - <xsl:attribute name="padding-bottom">0.5em</xsl:attribute> - <xsl:attribute name="margin-left">0.5em</xsl:attribute> - <xsl:attribute name="margin-right">0.5em</xsl:attribute> - </xsl:attribute-set> - - <!-- Shade (background) programlistings --> - <xsl:param name="shade.verbatim">1</xsl:param> - <xsl:attribute-set name="shade.verbatim.style"> - <xsl:attribute name="background-color">#F0F0F0</xsl:attribute> - </xsl:attribute-set> - - <xsl:attribute-set name="list.block.spacing"> - <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - - <xsl:attribute-set name="example.properties"> - <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.optimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.5em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - <xsl:attribute name="keep-together.within-column">always</xsl:attribute> - </xsl:attribute-set> - -<!--################################################### - Title information for Figures, Examples etc. - ################################################### --> - - <xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing"> - <xsl:attribute name="font-weight">normal</xsl:attribute> - <xsl:attribute name="font-style">italic</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - -<!--################################################### - Callouts - ################################################### --> - - <!-- don't use images for callouts --> - <xsl:param name="callout.graphics">0</xsl:param> - <xsl:param name="callout.unicode">1</xsl:param> - - <!-- Place callout marks at this column in annotated areas --> - <xsl:param name="callout.defaultcolumn">90</xsl:param> - -<!--################################################### - Misc - ################################################### --> - - <!-- Placement of titles --> - <xsl:param name="formal.title.placement"> - figure after - example after - equation before - table before - procedure before - </xsl:param> - - <!-- Format Variable Lists as Blocks (prevents horizontal overflow) --> - <xsl:param name="variablelist.as.blocks">1</xsl:param> - - <xsl:param name="body.start.indent">0pt</xsl:param> - - <!-- Remove "Chapter" from the Chapter titles... --> - <xsl:param name="local.l10n.xml" select="document('')"/> - <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> - <l:l10n language="en"> - <l:context name="title-numbered"> - <l:template name="chapter" text="%n. %t"/> - <l:template name="section" text="%n %t"/> - </l:context> - <l:context name="title"> - <l:template name="example" text="Example %n %t"/> - </l:context> - </l:l10n> - </l:i18n> -</xsl:stylesheet> \ No newline at end of file diff --git a/spring-integration-reference/styles/pdf/titlepage.xml b/spring-integration-reference/styles/pdf/titlepage.xml deleted file mode 100644 index 7f84106a57..0000000000 --- a/spring-integration-reference/styles/pdf/titlepage.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you 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. ---> - -<!DOCTYPE t:templates [ -<!ENTITY hsize0 "10pt"> -<!ENTITY hsize1 "12pt"> -<!ENTITY hsize2 "14.4pt"> -<!ENTITY hsize3 "17.28pt"> -<!ENTITY hsize4 "20.736pt"> -<!ENTITY hsize5 "24.8832pt"> -<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 --> -<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 --> -<!ENTITY hsize2space "10.8pt"> <!-- 0.75 * hsize2 --> -<!ENTITY hsize3space "12.96pt"> <!-- 0.75 * hsize3 --> -<!ENTITY hsize4space "15.552pt"> <!-- 0.75 * hsize4 --> -<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 --> -]> -<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0" - xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param" - xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - <t:titlepage t:element="book" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:named-template="division.title" - param:node="ancestor-or-self::book[1]" - text-align="center" - font-size="&hsize5;" - space-before="&hsize5space;" - font-weight="bold" - font-family="{$title.fontset}"/> - <subtitle - text-align="center" - font-size="&hsize4;" - space-before="&hsize4space;" - font-family="{$title.fontset}"/> - - <corpauthor space-before="0.5em" - font-size="&hsize2;"/> - <authorgroup space-before="0.5em" - font-size="&hsize2;"/> - <author space-before="0.5em" - font-size="&hsize2;"/> - - <mediaobject space-before="2em" space-after="2em"/> - <copyright space-before="1.5em"/> - <releaseinfo space-before="5em" font-size="&hsize2;"/> - <legalnotice space-before="15em"/> - <othercredit space-before="2em" - font-weight="normal" - font-size="8"/> - <pubdate space-before="0.5em"/> - <revision space-before="0.5em"/> - <revhistory space-before="0.5em"/> - <abstract space-before="0.5em" - text-align="start" - margin-left="0.5in" - margin-right="0.5in" - font-family="{$body.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -</t:templates> diff --git a/spring-integration-samples/.classpath b/spring-integration-samples/.classpath index aed95ab67f..856c15de89 100644 --- a/spring-integration-samples/.classpath +++ b/spring-integration-samples/.classpath @@ -3,18 +3,17 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="IVY_CACHE/org.aopalliance/aopalliance/aopalliance-1.0.jar" sourcepath="IVY_CACHE/org.aopalliance/aopalliance/aopalliance-sources-1.0.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.apache/commons-logging/commons-logging-1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-4.4.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-4.4.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-aop/spring-aop-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-aop/spring-aop-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-beans/spring-beans-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context/spring-context-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-core/spring-core-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context-support/spring-context-support-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-jms/spring-jms-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-tx/spring-tx-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.apache/commons-pool/commons-pool-1.3.jar"/> - <classpathentry kind="var" path="IVY_CACHE/javax.jms/jms/jms-1.1.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/2.5.4.A/org.springframework.aop-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/2.5.4.A/org.springframework.aop-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.4.A/org.springframework.beans-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.4.A/org.springframework.beans-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.4.A/org.springframework.context-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.4.A/org.springframework.context-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/2.5.4.A/org.springframework.context.support-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/2.5.4.A/org.springframework.context.support-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.4.A/org.springframework.core-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.4.A/org.springframework.core-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.jms/2.5.4.A/org.springframework.jms-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.jms/2.5.4.A/org.springframework.jms-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/2.5.4.A/org.springframework.transaction-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/2.5.4.A/org.springframework.transaction-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-1.1.0.jar" sourcepath="/IVY_CACHE/javax.jms/com.springsource.javax.jms/1.1.0/com.springsource.javax.jms-sources-1.1.0.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spring-integration-core"/> <classpathentry combineaccessrules="false" kind="src" path="/spring-integration-adapters"/> <classpathentry kind="output" path="target/classes"/> diff --git a/spring-integration-samples/ivy.xml b/spring-integration-samples/ivy.xml index 9d70a03371..c99f205d35 100644 --- a/spring-integration-samples/ivy.xml +++ b/spring-integration-samples/ivy.xml @@ -20,13 +20,13 @@ </publications> <dependencies> - <dependency org="javax.jms" name="jms" rev="1.1" conf="compile->default"/> - <dependency org="org.junit" name="junit" rev="4.4" conf="test->default"/> - <dependency org="org.springframework.integration" name="spring-integration-core" rev="latest.integration" conf="compile"/> - <dependency org="org.springframework" name="spring-context" rev="2.5.2" conf="compile->default"/> - <dependency org="org.springframework" name="spring-aop" rev="2.5.2" conf="compile->default"/> - <dependency org="org.springframework" name="spring-jms" rev="2.5.2" conf="compile->default"/> - <dependency org="org.springframework" name="spring-tx" rev="2.5.2" conf="compile->default"/> + <dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="provided->runtime"/> + <dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/> + <dependency org="org.springframework.integration" name="spring-integration-core" rev="latest.integration" conf="compile->compile"/> + <dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->runtime"/> + <dependency org="org.springframework" name="org.springframework.aop" rev="2.5.4.A" conf="compile->runtime"/> + <dependency org="org.springframework" name="org.springframework.jms" rev="2.5.4.A" conf="compile->runtime"/> + <dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.4.A" conf="compile->runtime"/> </dependencies> </ivy-module> \ No newline at end of file diff --git a/spring-integration-test/.classpath b/spring-integration-test/.classpath index b5f8937c67..f2c2e4dae1 100644 --- a/spring-integration-test/.classpath +++ b/spring-integration-test/.classpath @@ -3,15 +3,15 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="IVY_CACHE/org.aopalliance/aopalliance/aopalliance-1.0.jar" sourcepath="IVY_CACHE/org.aopalliance/aopalliance/aopalliance-sources-1.0.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.apache/commons-logging/commons-logging-1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-4.4.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-4.4.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-aop/spring-aop-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-aop/spring-aop-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-beans/spring-beans-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context/spring-context-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-core/spring-core-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context-support/spring-context-support-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-context-support/spring-context-support-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-test/spring-test-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-test/spring-test-sources-2.5.2.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/2.5.4.A/org.springframework.aop-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/2.5.4.A/org.springframework.aop-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.4.A/org.springframework.beans-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.4.A/org.springframework.beans-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.4.A/org.springframework.context-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.4.A/org.springframework.context-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/2.5.4.A/org.springframework.context.support-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/2.5.4.A/org.springframework.context.support-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.4.A/org.springframework.core-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.4.A/org.springframework.core-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/2.5.4.A/org.springframework.test-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/2.5.4.A/org.springframework.test-sources-2.5.4.A.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spring-integration-core"/> <classpathentry combineaccessrules="false" kind="src" path="/spring-integration-adapters"/> <classpathentry kind="output" path="target/classes"/> diff --git a/spring-integration-test/ivy.xml b/spring-integration-test/ivy.xml index f16d6081ff..7b907e3862 100644 --- a/spring-integration-test/ivy.xml +++ b/spring-integration-test/ivy.xml @@ -20,10 +20,10 @@ </publications> <dependencies> - <dependency org="org.junit" name="junit" rev="4.4" conf="test->default"/> - <dependency org="org.springframework.integration" name="spring-integration-core" rev="latest.integration" conf="compile"/> - <dependency org="org.springframework.integration" name="spring-integration-adapters" rev="latest.integration" conf="compile"/> - <dependency org="org.springframework" name="spring-test" rev="2.5.2" conf="compile->default"/> + <dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/> + <dependency org="org.springframework.integration" name="spring-integration-core" rev="latest.integration" conf="compile->compile"/> + <dependency org="org.springframework.integration" name="spring-integration-adapters" rev="latest.integration" conf="compile->compile"/> + <dependency org="org.springframework" name="org.springframework.test" rev="2.5.4.A" conf="compile->runtime"/> </dependencies> </ivy-module> \ No newline at end of file diff --git a/spring-integration-ws/.classpath b/spring-integration-ws/.classpath index b17891c442..0cecd1c636 100644 --- a/spring-integration-ws/.classpath +++ b/spring-integration-ws/.classpath @@ -3,17 +3,17 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="IVY_CACHE/com.sun.xml.soap/saaj-impl/saaj-impl-1.3.jar"/> - <classpathentry kind="var" path="IVY_CACHE/javax.xml.soap/saaj-api/saaj-api-1.3.jar"/> - <classpathentry kind="var" path="IVY_CACHE/javax.xml/stax-api/stax-api-1.0.1.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.apache/commons-logging/commons-logging-1.1.jar" sourcepath="/IVY_CACHE/org.apache/commons-logging/commons-logging-sources-1.1.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.junit/junit/junit-4.4.jar" sourcepath="/IVY_CACHE/org.junit/junit/junit-sources-4.4.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-beans/spring-beans-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-beans/spring-beans-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-context/spring-context-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-context/spring-context-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework/spring-core/spring-core-2.5.2.jar" sourcepath="/IVY_CACHE/org.springframework/spring-core/spring-core-sources-2.5.2.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/spring-ws-core/spring-ws-core-1.0.3.jar" sourcepath="/IVY_CACHE/org.springframework.ws/spring-ws-core/spring-ws-core-sources-1.0.3.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/spring-oxm/spring-oxm-1.0.3.jar" sourcepath="/IVY_CACHE/org.springframework.ws/spring-oxm/spring-oxm-sources-1.0.3.jar"/> - <classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/spring-xml/spring-xml-1.0.3.jar" sourcepath="/IVY_CACHE/org.springframework.ws/spring-xml/spring-xml-sources-1.0.3.jar"/> + <classpathentry kind="var" path="IVY_CACHE/com.sun.xml/com.springsource.com.sun.xml.messaging.saaj/1.3.0/com.springsource.com.sun.xml.messaging.saaj-1.3.0.jar" sourcepath="/IVY_CACHE/com.sun.xml/com.springsource.com.sun.xml.messaging.saaj/1.3.0/com.springsource.com.sun.xml.messaging.saaj-sources-1.3.0.jar"/> + <classpathentry kind="var" path="IVY_CACHE/javax.xml.soap/com.springsource.javax.xml.soap/1.3.0/com.springsource.javax.xml.soap-1.3.0.jar" sourcepath="/IVY_CACHE/javax.xml.soap/com.springsource.javax.xml.soap/1.3.0/com.springsource.javax.xml.soap-sources-1.3.0.jar"/> + <classpathentry kind="var" path="IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-1.0.1.jar" sourcepath="/IVY_CACHE/javax.xml.stream/com.springsource.javax.xml.stream/1.0.1/com.springsource.javax.xml.stream-sources-1.0.1.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/2.5.4.A/org.springframework.beans-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/2.5.4.A/org.springframework.beans-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/2.5.4.A/org.springframework.context-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/2.5.4.A/org.springframework.context-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/2.5.4.A/org.springframework.core-2.5.4.A.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/2.5.4.A/org.springframework.core-sources-2.5.4.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.1.A/org.springframework.ws-1.5.1.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.ws/1.5.1.A/org.springframework.ws-sources-1.5.1.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.1.A/org.springframework.oxm-1.5.1.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.oxm/1.5.1.A/org.springframework.oxm-sources-1.5.1.A.jar"/> + <classpathentry kind="var" path="IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.1.A/org.springframework.xml-1.5.1.A.jar" sourcepath="/IVY_CACHE/org.springframework.ws/org.springframework.xml/1.5.1.A/org.springframework.xml-sources-1.5.1.A.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spring-integration-adapters"/> <classpathentry combineaccessrules="false" kind="src" path="/spring-integration-core"/> <classpathentry kind="output" path="target/classes"/> diff --git a/spring-integration-ws/ivy.xml b/spring-integration-ws/ivy.xml index 61fd979068..023cb4e1ab 100644 --- a/spring-integration-ws/ivy.xml +++ b/spring-integration-ws/ivy.xml @@ -20,13 +20,13 @@ </publications> <dependencies> - <dependency org="com.sun.xml.soap" name="saaj-impl" rev="1.3" conf="compile->default"/> - <dependency org="javax.xml.soap" name="saaj-api" rev="1.3" conf="compile->default"/> - <dependency org="javax.xml" name="stax-api" rev="1.0.1" conf="compile->default"/> - <dependency org="org.junit" name="junit" rev="4.4" conf="test->default"/> - <dependency org="org.springframework.integration" name="spring-integration-adapters" rev="latest.integration" conf="compile"/> - <dependency org="org.springframework.ws" name="spring-oxm" rev="1.0.3" conf="compile->default"/> - <dependency org="org.springframework.ws" name="spring-ws-core" rev="1.0.3" conf="compile->default"/> + <dependency org="com.sun.xml" name="com.springsource.com.sun.xml.messaging.saaj" rev="1.3.0" conf="provided->runtime"/> + <dependency org="javax.xml.soap" name="com.springsource.javax.xml.soap" rev="1.3.0" conf="provided->runtime"/> + <dependency org="javax.xml.stream" name="com.springsource.javax.xml.stream" rev="1.0.1" conf="provided->runtime"/> + <dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime"/> + <dependency org="org.springframework.integration" name="spring-integration-adapters" rev="latest.integration" conf="compile->compile"/> + <dependency org="org.springframework.ws" name="org.springframework.oxm" rev="1.5.1.A" conf="compile->runtime"/> + <dependency org="org.springframework.ws" name="org.springframework.ws" rev="1.5.1.A" conf="compile->runtime"/> </dependencies> </ivy-module> \ No newline at end of file