You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by js...@apache.org on 2006/10/08 17:22:53 UTC

svn commit: r454154 [1/2] - in /incubator/servicemix/trunk/servicemix-jabber: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/servicemix/ src/main/java/org/apache/servicemix/jabber/ src/main/jbi/ s...

Author: jstrachan
Date: Sun Oct  8 08:22:51 2006
New Revision: 454154

URL: http://svn.apache.org/viewvc?view=rev&rev=454154
Log:
added a first cut of the port of the jabber component from a lwcomponent to a fully fledged service-engine

Added:
    incubator/servicemix/trunk/servicemix-jabber/
    incubator/servicemix/trunk/servicemix-jabber/pom.xml
    incubator/servicemix/trunk/servicemix-jabber/src/
    incubator/servicemix/trunk/servicemix-jabber/src/main/
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/GroupChatEndpoint.java
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberComponent.java
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberEndpoint.java
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberListenerException.java
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberMarshaler.java
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/PrivateChatEndpoint.java
    incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/package.html
    incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/
    incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/
    incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/DISCLAIMER
    incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/LICENSE
    incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/NOTICE
    incubator/servicemix/trunk/servicemix-jabber/src/main/resources/
    incubator/servicemix/trunk/servicemix-jabber/src/main/resources/META-INF/
    incubator/servicemix/trunk/servicemix-jabber/src/main/resources/META-INF/DISCLAIMER
    incubator/servicemix/trunk/servicemix-jabber/src/main/resources/META-INF/LICENSE
    incubator/servicemix/trunk/servicemix-jabber/src/main/resources/META-INF/NOTICE
    incubator/servicemix/trunk/servicemix-jabber/src/test/
    incubator/servicemix/trunk/servicemix-jabber/src/test/java/
    incubator/servicemix/trunk/servicemix-jabber/src/test/java/org/
    incubator/servicemix/trunk/servicemix-jabber/src/test/java/org/apache/
    incubator/servicemix/trunk/servicemix-jabber/src/test/java/org/apache/servicemix/
    incubator/servicemix/trunk/servicemix-jabber/src/test/java/org/apache/servicemix/jabber/
    incubator/servicemix/trunk/servicemix-jabber/src/test/java/org/apache/servicemix/jabber/DynamicEndpointTest.java
    incubator/servicemix/trunk/servicemix-jabber/src/test/java/org/apache/servicemix/jabber/SpringComponentTest.java
    incubator/servicemix/trunk/servicemix-jabber/src/test/resources/
    incubator/servicemix/trunk/servicemix-jabber/src/test/resources/log4j.properties
    incubator/servicemix/trunk/servicemix-jabber/src/test/resources/org/
    incubator/servicemix/trunk/servicemix-jabber/src/test/resources/org/apache/
    incubator/servicemix/trunk/servicemix-jabber/src/test/resources/org/apache/servicemix/
    incubator/servicemix/trunk/servicemix-jabber/src/test/resources/org/apache/servicemix/jabber/
    incubator/servicemix/trunk/servicemix-jabber/src/test/resources/spring-no-endpoints.xml
    incubator/servicemix/trunk/servicemix-jabber/src/test/resources/spring.xml

Added: incubator/servicemix/trunk/servicemix-jabber/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/pom.xml?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/pom.xml (added)
+++ incubator/servicemix/trunk/servicemix-jabber/pom.xml Sun Oct  8 08:22:51 2006
@@ -0,0 +1,108 @@
+<?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.
+
+-->
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+  <parent>
+    <groupId>org.apache.servicemix</groupId>
+    <artifactId>servicemix</artifactId>
+    <version>3.1-incubating-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.servicemix</groupId>
+  <artifactId>servicemix-jabber</artifactId>
+  <packaging>jbi-component</packaging>
+  <name>ServiceMix Jabber</name>
+  <description>A Jabber component</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-shared</artifactId>
+      <version>${servicemix-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>servicemix-core</artifactId>
+      <version>${servicemix-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jivesoftware</groupId>
+      <artifactId>smack</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>jivesoftware</groupId>
+      <artifactId>smackx</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.servicemix.tooling</groupId>
+        <artifactId>jbi-maven-plugin</artifactId>
+        <version>${servicemix-version}</version>
+        <extensions>true</extensions>
+        <configuration>
+          <type>service-engine</type>
+          <component>org.apache.servicemix.jabber.JabberComponent</component>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>maven-xbean-plugin</artifactId>
+        <version>${xbean-version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>mapping</goal>
+            </goals>
+            <configuration>
+              <namespace>http://servicemix.apache.org/jabber/1.0</namespace>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <!--  TODO - need an embedded Jabber server to be able to properly test -->
+            <exclude>**/*Test.*</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Added: incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/GroupChatEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/GroupChatEndpoint.java?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/GroupChatEndpoint.java (added)
+++ incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/GroupChatEndpoint.java Sun Oct  8 08:22:51 2006
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.jabber;
+
+import org.jivesoftware.smack.GroupChat;
+import org.jivesoftware.smack.packet.Message;
+
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.jbi.servicedesc.ServiceEndpoint;
+
+/**
+ * Represents a group chat endpoint
+ *
+ * @version $Revision: $
+ * @org.apache.xbean.XBean element="groupChatEndpoint"
+ */
+public class GroupChatEndpoint extends JabberEndpoint {
+
+    private GroupChat chat;
+    private String room;
+
+
+    public GroupChatEndpoint() {
+    }
+
+    public GroupChatEndpoint(JabberComponent component, ServiceEndpoint serviceEndpoint) {
+        super(component, serviceEndpoint);
+    }
+
+    public GroupChatEndpoint(JabberComponent component, ServiceEndpoint serviceEndpoint, String room) {
+        super(component, serviceEndpoint);
+        this.room = room;
+    }
+
+    public void start() throws Exception {
+        super.start();
+        if (chat == null) {
+            if (room == null) {
+                throw new IllegalArgumentException("No room property specified");
+            }
+            chat = getConnection().createGroupChat(room);
+        }
+    }
+
+    public void stop() throws Exception {
+        if (chat != null) {
+            chat.leave();
+            chat = null;
+        }
+        super.stop();
+    }
+
+    // Properties
+    //-------------------------------------------------------------------------
+    public GroupChat getChat() {
+        return chat;
+    }
+
+    public void setChat(GroupChat chat) {
+        this.chat = chat;
+    }
+
+    public String getRoom() {
+        return room;
+    }
+
+    public void setRoom(String room) {
+        this.room = room;
+    }
+
+
+    // Implementation methods
+    //-------------------------------------------------------------------------
+    protected void processInOnly(MessageExchange exchange, NormalizedMessage normalizedMessage) throws Exception {
+        Message message = chat.createMessage();
+        getMarshaler().fromNMS(message, normalizedMessage);
+        chat.sendMessage(message);
+        done(exchange);
+    }
+}

Added: incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberComponent.java?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberComponent.java (added)
+++ incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberComponent.java Sun Oct  8 08:22:51 2006
@@ -0,0 +1,110 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.jabber;
+
+import org.apache.activemq.util.URISupport;
+import org.apache.servicemix.common.DefaultComponent;
+import org.apache.servicemix.common.Endpoint;
+import org.apache.servicemix.common.ResolvedEndpoint;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.w3c.dom.DocumentFragment;
+
+import javax.jbi.servicedesc.ServiceEndpoint;
+import javax.xml.namespace.QName;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A JBI component for binding POJOs to the JBI bus which work directly off of the JBI messages
+ * without requiring any SOAP Processing. If you require support for SOAP, JAX-WS, JSR-181 then you
+ * should use the servicemix-jsr181 module instead.
+ *
+ * @version $Revision: $
+ * @org.apache.xbean.XBean element="component" description="POJO Component"
+ */
+public class JabberComponent extends DefaultComponent implements BeanFactoryAware {
+
+    public final static String EPR_URI = "urn:servicemix:jabber";
+    public final static QName EPR_SERVICE = new QName(EPR_URI, "JabberComponent");
+    public final static String EPR_NAME = "epr";
+
+    private JabberEndpoint[] endpoints;
+    private BeanFactory beanFactory;
+
+
+    public JabberEndpoint[] getEndpoints() {
+        return endpoints;
+    }
+
+    public void setEndpoints(JabberEndpoint[] endpoints) {
+        this.endpoints = endpoints;
+    }
+
+    public BeanFactory getBeanFactory() {
+        return beanFactory;
+    }
+
+    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+        this.beanFactory = beanFactory;
+    }
+
+    public ServiceEndpoint resolveEndpointReference(DocumentFragment epr) {
+        return ResolvedEndpoint.resolveEndpoint(epr, EPR_URI, EPR_NAME, EPR_SERVICE, "jabber:");
+    }
+
+    protected List getConfiguredEndpoints() {
+        return asList(getEndpoints());
+    }
+
+    protected Class[] getEndpointClasses() {
+        return new Class[]{JabberEndpoint.class};
+    }
+
+    protected QName getEPRServiceName() {
+        return EPR_SERVICE;
+    }
+
+    protected Endpoint getResolvedEPR(ServiceEndpoint ep) throws Exception {
+        URI uri = new URI(ep.getEndpointName());
+        Map map = URISupport.parseQuery(uri.getQuery());
+
+        JabberEndpoint endpoint = null;
+        // TODO how do we decide whether to use group or private chat from the URI??
+        String room = (String) map.get("room");
+        if (room != null) {
+            endpoint = new GroupChatEndpoint(this, ep, room);
+        }
+        else {
+            endpoint = new PrivateChatEndpoint(this, ep);
+        }
+
+        // TODO
+        //endpoint.setRole(MessageExchange.Role.PROVIDER);
+
+        endpoint.setUri(uri);
+
+        // TODO
+        // IntrospectionSupport.setProperties(endpoint.getBean(), map);
+
+        endpoint.activate();
+        return endpoint;
+    }
+
+}

Added: incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberEndpoint.java?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberEndpoint.java (added)
+++ incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberEndpoint.java Sun Oct  8 08:22:51 2006
@@ -0,0 +1,191 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.jabber;
+
+import org.apache.servicemix.common.ProviderEndpoint;
+import org.jivesoftware.smack.AccountManager;
+import org.jivesoftware.smack.PacketListener;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.filter.PacketFilter;
+import org.jivesoftware.smack.packet.Packet;
+
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.jbi.servicedesc.ServiceEndpoint;
+import java.net.URI;
+
+/**
+ * Represents a base Jabber endpoint
+ *
+ * @version $Revision: $
+ */
+public abstract class JabberEndpoint extends ProviderEndpoint implements PacketListener {
+    private JabberMarshaler marshaler = new JabberMarshaler();
+    private XMPPConnection connection;
+    private String host;
+    private int port;
+    private String user;
+    private String password;
+    private String resource = "ServiceMix";
+    private boolean login = true;
+    private PacketFilter filter;
+
+    public JabberEndpoint() {
+    }
+
+    public JabberEndpoint(JabberComponent component, ServiceEndpoint serviceEndpoint) {
+        super(component, serviceEndpoint);
+    }
+
+    public void stop() throws Exception {
+        super.stop();
+        if (connection != null) {
+            connection.close();
+            connection = null;
+        }
+    }
+
+    public void start() throws Exception {
+        super.start();
+        if (connection == null) {
+            if (port > 0) {
+                connection = new XMPPConnection(host, port);
+            }
+            else {
+                connection = new XMPPConnection(host);
+            }
+        }
+        getConnection().addPacketListener(this, filter);
+        if (login && !connection.isAuthenticated()) {
+            if (user != null) {
+                AccountManager accountManager = new AccountManager(connection);
+                accountManager.createAccount(user, password);
+
+                logger.info("Logging in to Jabber as user: " + user + " on connection: " + connection);
+                connection.login(user, password, resource);
+            }
+            else {
+                logger.info("Logging in anonymously to Jabber on connection: " + connection);
+                connection.loginAnonymously();
+            }
+        }
+    }
+
+
+    public void processPacket(Packet packet) {
+        try {
+            InOnly exchange = getExchangeFactory().createInOnlyExchange();
+            NormalizedMessage in = exchange.createMessage();
+            exchange.setInMessage(in);
+            marshaler.toNMS(in, packet);
+            done(exchange);
+        }
+        catch (MessagingException e) {
+            throw new JabberListenerException(e, packet);
+        }
+    }
+
+    // Properties
+    //-------------------------------------------------------------------------
+
+    /**
+     * Configures the endpoint from a URI
+     */
+    public void setUri(URI uri) {
+        setHost(uri.getHost());
+        setPort(uri.getPort());
+        setUser(uri.getUserInfo());
+        setPassword(uri.getAuthority());
+        String path = uri.getPath();
+        if (path != null) {
+            setResource(path);
+        }
+    }
+
+    public XMPPConnection getConnection() {
+        return connection;
+    }
+
+    public void setConnection(XMPPConnection connection) {
+        this.connection = connection;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public void setPort(int port) {
+        this.port = port;
+    }
+
+    public JabberMarshaler getMarshaler() {
+        return marshaler;
+    }
+
+    public void setMarshaler(JabberMarshaler marshaler) {
+        this.marshaler = marshaler;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getResource() {
+        return resource;
+    }
+
+    public void setResource(String resource) {
+        this.resource = resource;
+    }
+
+    public boolean isLogin() {
+        return login;
+    }
+
+    public void setLogin(boolean login) {
+        this.login = login;
+    }
+
+    public PacketFilter getFilter() {
+        return filter;
+    }
+
+    public void setFilter(PacketFilter filter) {
+        this.filter = filter;
+    }
+}

Added: incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberListenerException.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberListenerException.java?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberListenerException.java (added)
+++ incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberListenerException.java Sun Oct  8 08:22:51 2006
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.jabber;
+
+import org.jivesoftware.smack.packet.Packet;
+
+/**
+ * A runtime exception thrown when processing inbound Jabber packets.
+ *
+ * @version $Revision: 426415 $
+ */
+public class JabberListenerException extends RuntimeException {
+    private Packet packet;
+
+    public JabberListenerException(Exception cause, Packet packet) {
+        super(cause.getMessage() + ". Was processing packet: " + packet, cause);
+        this.packet = packet;
+    }
+
+    public Packet getPacket() {
+        return packet;
+    }
+}

Added: incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberMarshaler.java?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberMarshaler.java (added)
+++ incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/JabberMarshaler.java Sun Oct  8 08:22:51 2006
@@ -0,0 +1,149 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.jabber;
+
+import org.apache.servicemix.jbi.jaxp.SourceMarshaler;
+import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.packet.Packet;
+
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerException;
+import java.util.Date;
+import java.util.Iterator;
+
+/**
+ * Marshals Jabber messages into and out of NMS messages
+ *
+ * @version $Revision: 429277 $
+ */
+public class JabberMarshaler {
+    private SourceMarshaler sourceMarshaler;
+
+    public JabberMarshaler() {
+        this(new SourceMarshaler());
+    }
+
+    public JabberMarshaler(SourceMarshaler sourceMarshaler) {
+        this.sourceMarshaler = sourceMarshaler;
+    }
+
+    /**
+     * Marshals the Jabber message into an NMS message
+     *
+     * @throws javax.jbi.messaging.MessagingException
+     *
+     */
+    public void toNMS(NormalizedMessage normalizedMessage, Packet packet) throws MessagingException {
+        addNmsProperties(normalizedMessage, packet);
+        if (packet instanceof Message) {
+            Message message = (Message) packet;
+            Source source = sourceMarshaler.asSource(message.getBody());
+            normalizedMessage.setContent(source);
+        }
+
+        // lets add the packet to the NMS
+        normalizedMessage.setProperty("org.apache.servicemix.jabber.packet", packet);
+    }
+
+    /**
+     * Marshals from the Jabber message to the normalized message
+     *
+     * @param message
+     * @param normalizedMessage
+     * @throws javax.xml.transform.TransformerException
+     *
+     */
+    public void fromNMS(Message message, NormalizedMessage normalizedMessage) throws TransformerException {
+        // lets create a text message
+        String xml = messageAsString(normalizedMessage);
+        message.setBody(xml);
+        addJabberProperties(message, normalizedMessage);
+    }
+
+    // Properties
+    //-------------------------------------------------------------------------
+    /**
+     * @deprecated use getSourceMarshaler instead
+     */
+    public SourceMarshaler getSourceMarshaller() {
+        return sourceMarshaler;
+    }
+
+    /**
+     * @deprecated use setSourceMashaler instead
+     */
+    public void setSourceMarshaller(SourceMarshaler sourceMarshaler) {
+        this.sourceMarshaler = sourceMarshaler;
+    }
+
+    /**
+     * @return the sourceMarshaler
+     */
+    public SourceMarshaler getSourceMarshaler() {
+        return sourceMarshaler;
+    }
+
+    /**
+     * @param sourceMarshaler the sourceMarshaler to set
+     */
+    public void setSourceMarshaler(SourceMarshaler sourceMarshaler) {
+        this.sourceMarshaler = sourceMarshaler;
+    }
+
+    // Implementation methods
+    //-------------------------------------------------------------------------
+
+    /**
+     * Converts the inbound message to a String that can be sent
+     */
+    protected String messageAsString(NormalizedMessage normalizedMessage) throws TransformerException {
+        return sourceMarshaler.asString(normalizedMessage.getContent());
+    }
+
+    /**
+     * Appends properties on the NMS to the JMS Message
+     */
+    protected void addJabberProperties(Message message, NormalizedMessage normalizedMessage) {
+        for (Iterator iter = normalizedMessage.getPropertyNames().iterator(); iter.hasNext();) {
+            String name = (String) iter.next();
+            Object value = normalizedMessage.getProperty(name);
+            if (shouldIncludeHeader(normalizedMessage, name, value)) {
+                message.setProperty(name, value);
+            }
+        }
+    }
+
+    protected void addNmsProperties(NormalizedMessage normalizedMessage, Packet message) {
+        Iterator iter = message.getPropertyNames();
+        while (iter.hasNext()) {
+            String name = (String) iter.next();
+            Object value = message.getProperty(name);
+            normalizedMessage.setProperty(name, value);
+        }
+    }
+
+    /**
+     * Decides whether or not the given header should be included in the JMS message.
+     * By default this includes all suitable typed values
+     */
+    protected boolean shouldIncludeHeader(NormalizedMessage normalizedMessage, String name, Object value) {
+        return value instanceof String || value instanceof Number || value instanceof Date;
+    }
+
+}

Added: incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/PrivateChatEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/PrivateChatEndpoint.java?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/PrivateChatEndpoint.java (added)
+++ incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/PrivateChatEndpoint.java Sun Oct  8 08:22:51 2006
@@ -0,0 +1,91 @@
+/*
+ * 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.
+ */
+package org.apache.servicemix.jabber;
+
+import org.jivesoftware.smack.Chat;
+import org.jivesoftware.smack.packet.Message;
+
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.jbi.servicedesc.ServiceEndpoint;
+
+/**
+ * Represents an endpoint for chatting to a single individual
+ *
+ * @version $Revision: $
+ * @org.apache.xbean.XBean element="privateChatEndpoint"
+ */
+public class PrivateChatEndpoint extends JabberEndpoint {
+
+    private Chat chat;
+    private String participant;
+
+    public PrivateChatEndpoint() {
+    }
+
+    public PrivateChatEndpoint(JabberComponent component, ServiceEndpoint serviceEndpoint) {
+        super(component, serviceEndpoint);
+    }
+
+    public PrivateChatEndpoint(JabberComponent component, ServiceEndpoint serviceEndpoint, String participant) {
+        super(component, serviceEndpoint);
+        this.participant = participant;
+    }
+
+    public void start() throws Exception {
+        super.start();
+        if (chat == null) {
+            if (participant == null) {
+                throw new IllegalArgumentException("No participant property specified");
+            }
+            chat = getConnection().createChat(participant);
+        }
+    }
+
+    public void stop() throws Exception {
+        chat = null;
+        super.stop();
+    }
+
+
+    // Properties
+    //-------------------------------------------------------------------------
+    public Chat getChat() {
+        return chat;
+    }
+
+    public void setChat(Chat chat) {
+        this.chat = chat;
+    }
+
+    public String getParticipant() {
+        return participant;
+    }
+
+    public void setParticipant(String participant) {
+        this.participant = participant;
+    }
+
+    // Implementation methods
+    //-------------------------------------------------------------------------
+    protected void processInOnly(MessageExchange exchange, NormalizedMessage normalizedMessage) throws Exception {
+        Message message = chat.createMessage();
+        getMarshaler().fromNMS(message, normalizedMessage);
+        chat.sendMessage(message);
+        done(exchange);
+    }
+}

Added: incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/package.html
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/package.html?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/package.html (added)
+++ incubator/servicemix/trunk/servicemix-jabber/src/main/java/org/apache/servicemix/jabber/package.html Sun Oct  8 08:22:51 2006
@@ -0,0 +1,28 @@
+<!--
+
+    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.
+
+-->
+<html>
+<head>
+</head>
+<body>
+
+Component for <a href="http://jabber.org/">Jabber</a> using the <a href="http://xmlpp.org/">XMPP</a> protocol via the
+<a href="http://www.jivesoftware.org/smack/">Smack</a> Java client
+
+</body>
+</html>

Added: incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/DISCLAIMER?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/DISCLAIMER (added)
+++ incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/DISCLAIMER Sun Oct  8 08:22:51 2006
@@ -0,0 +1,6 @@
+Apache ServiceMix is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Geronimo PMC. 
+Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, 
+communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or stability of the code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.

Added: incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/LICENSE?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/LICENSE (added)
+++ incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/LICENSE Sun Oct  8 08:22:51 2006
@@ -0,0 +1,576 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+################################################################################
+
+APACHE SERVICEMIX PACKAGES
+
+The Apache ServiceMix distribution includes a number of dependent packages with
+separate copyright notices and license terms. Your use of the source code for 
+these subcomponents is subject to the terms and conditions of the following 
+licenses. 
+
+=========================================================================
+==  Saxon License                                                      ==
+=========================================================================
+
+                           MOZILLA PUBLIC LICENSE
+                                Version 1.0
+
+                              ----------------
+
+1. Definitions.
+
+     1.1. ``Contributor'' means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. ``Contributor Version'' means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. ``Covered Code'' means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. ``Electronic Distribution Mechanism'' means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. ``Executable'' means Covered Code in any form other than Source
+     Code.
+
+     1.6. ``Initial Developer'' means the individual or entity identified as
+     the Initial Developer in the Source Code notice required by Exhibit A.
+
+     1.7. ``Larger Work'' means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. ``License'' means this document.
+
+     1.9. ``Modifications'' means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. ``Original Code'' means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this License
+     is not already Covered Code governed by this License.
+
+     1.11. ``Source Code'' means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus any
+     associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or a list of source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. ``You'' means an individual or a legal entity exercising rights
+     under, and complying with all of the terms of, this License or a future
+     version of this License issued under Section 6.1. For legal entities,
+     ``You'' includes any entity which controls, is controlled by, or is
+     under common control with You. For purposes of this definition,
+     ``control'' means (a) the power, direct or indirect, to cause the
+     direction or management of such entity, whether by contract or
+     otherwise, or (b) ownership of fifty percent (50%) or more of the
+     outstanding shares or beneficial ownership of such entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+
+          (a) to use, reproduce, modify, display, perform, sublicense and
+          distribute the Original Code (or portions thereof) with or without
+          Modifications, or as part of a Larger Work; and
+
+          (b) under patents now or hereafter owned or controlled by Initial
+          Developer, to make, have made, use and sell (``Utilize'') the
+          Original Code (or portions thereof), but solely to the extent that
+          any such patent is reasonably necessary to enable You to Utilize
+          the Original Code (or portions thereof) and not to any greater
+          extent that may be necessary to Utilize further Modifications or
+          combinations.
+
+     2.2. Contributor Grant.
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+
+          (a) to use, reproduce, modify, display, perform, sublicense and
+          distribute the Modifications created by such Contributor (or
+          portions thereof) either on an unmodified basis, with other
+          Modifications, as Covered Code or as part of a Larger Work; and
+
+          (b) under patents now or hereafter owned or controlled by
+          Contributor, to Utilize the Contributor Version (or portions
+          thereof), but solely to the extent that any such patent is
+          reasonably necessary to enable You to Utilize the Contributor
+          Version (or portions thereof), and not to any greater extent that
+          may be necessary to Utilize further Modifications or combinations.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be distributed
+     only under the terms of this License or a future version of this
+     License released under Section 6.1, and You must include a copy of this
+     License with every copy of the Source Code You distribute. You may not
+     offer or impose any terms on any Source Code version that alters or
+     restricts the applicable version of this License or the recipients'
+     rights hereunder. However, You may include an additional document
+     offering the additional rights described in Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which you contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that the
+     Modification is derived, directly or indirectly, from Original Code
+     provided by the Initial Developer and including the name of the Initial
+     Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+
+          (a) Third Party Claims.
+          If You have knowledge that a party claims an intellectual property
+          right in particular functionality or code (or its utilization
+          under this License), you must include a text file with the source
+          code distribution titled ``LEGAL'' which describes the claim and
+          the party making the claim in sufficient detail that a recipient
+          will know whom to contact. If you obtain such knowledge after You
+          make Your Modification available as described in Section 3.2, You
+          shall promptly modify the LEGAL file in all copies You make
+          available thereafter and shall take other steps (such as notifying
+          appropriate mailing lists or newsgroups) reasonably calculated to
+          inform those who received the Covered Code that new knowledge has
+          been obtained.
+
+          (b) Contributor APIs.
+          If Your Modification is an application programming interface and
+          You own or control patents which are reasonably necessary to
+          implement that API, you must also include this information in the
+          LEGAL file.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code, and this License in any documentation for the Source Code, where
+     You describe recipients' rights relating to Covered Code. If You
+     created one or more Modification(s), You may add your name as a
+     Contributor to the notice described in Exhibit A. If it is not possible
+     to put such notice in a particular Source Code file due to its
+     structure, then you must include such notice in a location (such as a
+     relevant directory file) where a user would be likely to look for such
+     a notice. You may choose to offer, and to charge a fee for, warranty,
+     support, indemnity or liability obligations to one or more recipients
+     of Covered Code. However, You may do so only on Your own behalf, and
+     not on behalf of the Initial Developer or any Contributor. You must
+     make it absolutely clear than any such warranty, support, indemnity or
+     liability obligation is offered by You alone, and You hereby agree to
+     indemnify the Initial Developer and every Contributor for any liability
+     incurred by the Initial Developer or such Contributor as a result of
+     warranty, support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of the
+     Covered Code is available under the terms of this License, including a
+     description of how and where You have fulfilled the obligations of
+     Section 3.2. The notice must be conspicuously included in any notice in
+     an Executable version, related documentation or collateral in which You
+     describe recipients' rights relating to the Covered Code. You may
+     distribute the Executable version of Covered Code under a license of
+     Your choice, which may contain terms different from this License,
+     provided that You are in compliance with the terms of this License and
+     that the license for the Executable version does not attempt to limit
+     or alter the recipient's rights in the Source Code version from the
+     rights set forth in this License. If You distribute the Executable
+     version under a different license You must make it absolutely clear
+     that any terms which differ from this License are offered by You alone,
+     not by the Initial Developer or any Contributor. You hereby agree to
+     indemnify the Initial Developer and every Contributor for any liability
+     incurred by the Initial Developer or such Contributor as a result of
+     any such terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to statute
+     or regulation then You must: (a) comply with the terms of this License
+     to the maximum extent possible; and (b) describe the limitations and
+     the code they affect. Such description must be included in the LEGAL
+     file described in Section 3.4 and must be included with all
+     distributions of the Source Code. Except to the extent prohibited by
+     statute or regulation, such description must be sufficiently detailed
+     for a recipient of ordinary skill to be able to understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A, and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation (``Netscape'') may publish revised
+     and/or new versions of the License from time to time. Each version will
+     be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If you create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), you must (a) rename Your license so that the
+     phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or
+     any confusingly similar phrase do not appear anywhere in your license
+     and (b) otherwise make it clear that your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial Developer,
+     Original Code or Contributor in the notice described in Exhibit A shall
+     not of themselves be deemed to be modifications of this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER
+     PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+     OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF
+     GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
+     ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE
+     BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT
+     EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a ``commercial item,'' as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer
+     software'' and ``commercial computer software documentation,'' as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if any,
+     provides otherwise), excluding its conflict-of-law provisions. With
+     respect to disputes in which at least one party is a citizen of, or an
+     entity chartered or registered to do business in, the United States of
+     America: (a) unless otherwise agreed in writing, all disputes relating
+     to this License (excepting any dispute relating to intellectual
+     property rights) shall be subject to final and binding arbitration,
+     with the losing party paying all costs of arbitration; (b) any
+     arbitration relating to this Agreement shall be held in Santa Clara
+     County, California, under the auspices of JAMS/EndDispute; and (c) any
+     litigation relating to this Agreement shall be subject to the
+     jurisdiction of the Federal Courts of the Northern District of
+     California, with venue lying in Santa Clara County, California, with
+     the losing party responsible for costs, including without limitation,
+     court costs and reasonable attorneys fees and expenses. The application
+     of the United Nations Convention on Contracts for the International
+     Sale of Goods is expressly excluded. Any law or regulation which
+     provides that the language of a contract shall be construed against the
+     drafter shall not apply to this License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     Except in cases where another Contributor has failed to comply with
+     Section 3.4, You are responsible for damages arising, directly or
+     indirectly, out of Your utilization of rights under this License, based
+     on the number of copies of Covered Code you made available, the
+     revenues you received from utilizing such rights, and other relevant
+     factors. You agree to work with affected parties to distribute
+     responsibility on an equitable basis.
+
+EXHIBIT A.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.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.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.''

Added: incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/NOTICE?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/NOTICE (added)
+++ incubator/servicemix/trunk/servicemix-jabber/src/main/jbi/META-INF/NOTICE Sun Oct  8 08:22:51 2006
@@ -0,0 +1,8 @@
+   =========================================================================
+   ==  NOTICE file for use with the Apache License, Version 2.0,          ==
+   ==  in this case for the Apache ServiceMix distribution.               ==
+   =========================================================================
+
+   This product contains software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+

Added: incubator/servicemix/trunk/servicemix-jabber/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jabber/src/main/resources/META-INF/DISCLAIMER?view=auto&rev=454154
==============================================================================
--- incubator/servicemix/trunk/servicemix-jabber/src/main/resources/META-INF/DISCLAIMER (added)
+++ incubator/servicemix/trunk/servicemix-jabber/src/main/resources/META-INF/DISCLAIMER Sun Oct  8 08:22:51 2006
@@ -0,0 +1,6 @@
+Apache ServiceMix is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Geronimo PMC. 
+Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, 
+communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. 
+
+While incubation status is not necessarily a reflection of the completeness or stability of the code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.