You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2007/03/24 14:18:56 UTC

svn commit: r522022 [2/3] - in /webservices/muse/trunk/modules: muse-wsn-api/src/org/apache/muse/ws/notification/ muse-wsn-api/src/org/apache/muse/ws/notification/faults/ muse-wsn-api/src/org/apache/muse/ws/notification/topics/ muse-wsn-impl/src/org/ap...

Modified: webservices/muse/trunk/modules/muse-wsn-api/src/org/apache/muse/ws/notification/topics/TopicSet.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-api/src/org/apache/muse/ws/notification/topics/TopicSet.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-api/src/org/apache/muse/ws/notification/topics/TopicSet.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-api/src/org/apache/muse/ws/notification/topics/TopicSet.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.topics;
 

Modified: webservices/muse/trunk/modules/muse-wsn-api/src/org/apache/muse/ws/notification/topics/WstConstants.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-api/src/org/apache/muse/ws/notification/topics/WstConstants.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-api/src/org/apache/muse/ws/notification/topics/WstConstants.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-api/src/org/apache/muse/ws/notification/topics/WstConstants.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.topics;
 

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterCollection.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterCollection.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterCollection.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterCollection.java Sat Mar 24 06:18:52 2007
@@ -1,107 +1,111 @@
-/*=============================================================================*
- *  Copyright 2007 The Apache Software Foundation
- *
- *  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.
- *=============================================================================*/
-
-package org.apache.muse.ws.notification.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import org.apache.muse.util.xml.XmlUtils;
-import org.apache.muse.ws.notification.Filter;
-import org.apache.muse.ws.notification.NotificationMessage;
-import org.apache.muse.ws.notification.WsnConstants;
-
-/**
- *
- * FilterCollection is a set of WSN subscription filters that a notification 
- * producer must evaluate when determining whether it should send a message 
- * to a consumer or not. It implements the {@linkplain Filter Filter} interface 
- * so that it can be treated as a single filter by filter-evaluating code; this 
- * allows us to use FilterCollection objects in places where a Filter is 
- * specified even though FilterCollection was not part of the original 2.x API.
- *
- * @author Dan Jemiolo (danj)
- *
- */
-
-public class FilterCollection implements Filter
-{
-    private Collection _filters = new ArrayList();
-    
-    public boolean accepts(NotificationMessage message)
-    {
-        Iterator i = getFilters().iterator();
-        
-        while (i.hasNext())
-        {
-            Filter next = (Filter)i.next();
-            
-            //
-            // only one filter has to fail for the whole thing to fail
-            //
-            if (!next.accepts(message))
-                return false;
-        }
-        
-        return true;
-    }
-    
-    public void addFilter(Filter filter)
-    {
-        _filters.add(filter);
-    }
-    
-    public Collection getFilters()
-    {
-        return Collections.unmodifiableCollection(_filters);
-    }
-    
-    public Element toXML()
-    {
-        return toXML(XmlUtils.EMPTY_DOC);
-    }
-    
-    public Element toXML(Document doc)
-    {
-        Element filterXML = XmlUtils.createElement(doc, WsnConstants.FILTER_QNAME);
-
-        Iterator i = getFilters().iterator();
-        
-        while (i.hasNext())
-        {
-            Filter next = (Filter)i.next();
-            Element nextXML = next.toXML(doc);
-            
-            //
-            // we have to 'move' instead of 'appendChild' because the other 
-            // Filter types already add a <Filter/> element as part of their 
-            // toXML() implementations, and we can't change this for reasons 
-            // of backwards compatibility. therefore, we just take the element 
-            // under the <Filter/> and move it under our new <Filter/>
-            //
-            XmlUtils.moveSubTree(nextXML, filterXML);
-        }
-        
-        return filterXML;
-    }
-    
-}
-
+/* 
+ * 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.muse.ws.notification.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import org.apache.muse.util.xml.XmlUtils;
+import org.apache.muse.ws.notification.Filter;
+import org.apache.muse.ws.notification.NotificationMessage;
+import org.apache.muse.ws.notification.WsnConstants;
+
+/**
+ *
+ * FilterCollection is a set of WSN subscription filters that a notification 
+ * producer must evaluate when determining whether it should send a message 
+ * to a consumer or not. It implements the {@linkplain Filter Filter} interface 
+ * so that it can be treated as a single filter by filter-evaluating code; this 
+ * allows us to use FilterCollection objects in places where a Filter is 
+ * specified even though FilterCollection was not part of the original 2.x API.
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ */
+
+public class FilterCollection implements Filter
+{
+    private Collection _filters = new ArrayList();
+    
+    public boolean accepts(NotificationMessage message)
+    {
+        Iterator i = getFilters().iterator();
+        
+        while (i.hasNext())
+        {
+            Filter next = (Filter)i.next();
+            
+            //
+            // only one filter has to fail for the whole thing to fail
+            //
+            if (!next.accepts(message))
+                return false;
+        }
+        
+        return true;
+    }
+    
+    public void addFilter(Filter filter)
+    {
+        _filters.add(filter);
+    }
+    
+    public Collection getFilters()
+    {
+        return Collections.unmodifiableCollection(_filters);
+    }
+    
+    public Element toXML()
+    {
+        return toXML(XmlUtils.EMPTY_DOC);
+    }
+    
+    public Element toXML(Document doc)
+    {
+        Element filterXML = XmlUtils.createElement(doc, WsnConstants.FILTER_QNAME);
+
+        Iterator i = getFilters().iterator();
+        
+        while (i.hasNext())
+        {
+            Filter next = (Filter)i.next();
+            Element nextXML = next.toXML(doc);
+            
+            //
+            // we have to 'move' instead of 'appendChild' because the other 
+            // Filter types already add a <Filter/> element as part of their 
+            // toXML() implementations, and we can't change this for reasons 
+            // of backwards compatibility. therefore, we just take the element 
+            // under the <Filter/> and move it under our new <Filter/>
+            //
+            XmlUtils.moveSubTree(nextXML, filterXML);
+        }
+        
+        return filterXML;
+    }
+    
+}
+

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterFactory.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterFactory.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterFactory.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterFactory.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.impl;
 

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterFactoryHandler.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterFactoryHandler.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterFactoryHandler.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterFactoryHandler.java Sat Mar 24 06:18:52 2007
@@ -1,42 +1,46 @@
-/*=============================================================================*
- *  Copyright 2007 The Apache Software Foundation
- *
- *  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.
- *=============================================================================*/
-
-package org.apache.muse.ws.notification.impl;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import org.apache.muse.ws.notification.Filter;
-import org.apache.muse.ws.resource.basefaults.BaseFault;
-
-/**
- *
- * FilterFactoryHandler is an interface for components that generate a single 
- * type of WSN filter from an XML fragment. It can be used by programmers to 
- * add support for custom filters to Muse's default implementation of WSN.
- *
- * @author Dan Jemiolo (danj)
- *
- */
-
-public interface FilterFactoryHandler
-{
-    boolean accepts(QName filterName, String filterDialect);
-    
-    Filter newInstance(Element filterXML)
-        throws BaseFault;    
-}
+/* 
+ * 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.muse.ws.notification.impl;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+import org.apache.muse.ws.notification.Filter;
+import org.apache.muse.ws.resource.basefaults.BaseFault;
+
+/**
+ *
+ * FilterFactoryHandler is an interface for components that generate a single 
+ * type of WSN filter from an XML fragment. It can be used by programmers to 
+ * add support for custom filters to Muse's default implementation of WSN.
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ */
+
+public interface FilterFactoryHandler
+{
+    boolean accepts(QName filterName, String filterDialect);
+    
+    Filter newInstance(Element filterXML)
+        throws BaseFault;    
+}

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterSerializer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterSerializer.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterSerializer.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/FilterSerializer.java Sat Mar 24 06:18:52 2007
@@ -1,54 +1,58 @@
-/*=============================================================================*
- *  Copyright 2007 The Apache Software Foundation
- *
- *  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.
- *=============================================================================*/
-
-package org.apache.muse.ws.notification.impl;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import org.apache.muse.core.serializer.Serializer;
-import org.apache.muse.util.xml.XmlUtils;
-import org.apache.muse.ws.addressing.soap.SoapFault;
-import org.apache.muse.ws.notification.Filter;
-
-/**
- *
- * FilterSerializer is a Muse serializer that converts WSN Filters to XML and back.
- *
- * @author Dan Jemiolo (danj)
- *
- */
-
-public class FilterSerializer implements Serializer
-{
-    public Object fromXML(Element xml) throws SoapFault
-    {
-        return FilterFactory.getInstance().newInstance(xml);
-    }
-    
-    public Class getSerializableType()
-    {
-        return Filter.class;
-    }
-    
-    public Element toXML(Object obj, QName qname)
-    {
-        Element filterXML = ((Filter)obj).toXML();
-        Element root = XmlUtils.createElement(qname);
-        return (Element)XmlUtils.moveSubTree(filterXML, root);
-    }
-}
+/* 
+ * 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.muse.ws.notification.impl;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+import org.apache.muse.core.serializer.Serializer;
+import org.apache.muse.util.xml.XmlUtils;
+import org.apache.muse.ws.addressing.soap.SoapFault;
+import org.apache.muse.ws.notification.Filter;
+
+/**
+ *
+ * FilterSerializer is a Muse serializer that converts WSN Filters to XML and back.
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ */
+
+public class FilterSerializer implements Serializer
+{
+    public Object fromXML(Element xml) throws SoapFault
+    {
+        return FilterFactory.getInstance().newInstance(xml);
+    }
+    
+    public Class getSerializableType()
+    {
+        return Filter.class;
+    }
+    
+    public Element toXML(Object obj, QName qname)
+    {
+        Element filterXML = ((Filter)obj).toXML();
+        Element root = XmlUtils.createElement(qname);
+        return (Element)XmlUtils.moveSubTree(filterXML, root);
+    }
+}

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessage.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessage.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessage.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessage.java Sat Mar 24 06:18:52 2007
@@ -1,85 +1,89 @@
-/*=============================================================================*
- *  Copyright 2007 The Apache Software Foundation
- *
- *  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.
- *=============================================================================*/
-
-package org.apache.muse.ws.notification.impl;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import org.apache.muse.util.messages.Messages;
-import org.apache.muse.util.messages.MessagesFactory;
-import org.apache.muse.util.xml.XmlSerializable;
-import org.apache.muse.util.xml.XmlUtils;
-import org.apache.muse.ws.notification.WsnConstants;
-import org.apache.muse.ws.notification.topics.WstConstants;
-
-/**
- *
- * GetCurrentMessage is a serializer/deserializer for the WS-Notification 
- * GetCurrentMessage operation's request content.
- *
- * @author Dan Jemiolo (danj)
- *
- */
-
-public class GetCurrentMessage implements XmlSerializable
-{
-    private static Messages _MESSAGES = MessagesFactory.get(GetCurrentMessage.class);
-    
-    private QName _topicPath = null;
-    
-    public GetCurrentMessage(Element xml)
-    {
-        _topicPath = XmlUtils.getQNameFromChild(xml, WsnConstants.TOPIC_QNAME);
-    }
-    
-    public GetCurrentMessage(QName topicPath)
-    {
-        _topicPath = topicPath;
-    }
-    
-    protected String getDialect(String name)
-    {
-        return name.indexOf('/') >= 0 ? WstConstants.CONCRETE_TOPIC_URI : WstConstants.SIMPLE_TOPIC_URI;
-    }
-    
-    public QName getTopicPath()
-    {
-        return _topicPath;
-    }
-    
-    public Element toXML()
-    {
-        return toXML(XmlUtils.EMPTY_DOC);
-    }
-    
-    public Element toXML(Document doc)
-    {
-        if (doc == null)
-            throw new NullPointerException(_MESSAGES.get("NullDocument"));
-        
-        Element root = XmlUtils.createElement(doc, WsnConstants.GET_CURRENT_QNAME);
-        Element topic = XmlUtils.createElement(doc, WsnConstants.TOPIC_QNAME, getTopicPath());
-                
-        String dialect = getDialect(_topicPath.getLocalPart());
-        topic.setAttribute(WsnConstants.DIALECT, dialect);
-        
-        root.appendChild(topic);
-        return root;
-    }
-}
+/* 
+ * 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.muse.ws.notification.impl;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import org.apache.muse.util.messages.Messages;
+import org.apache.muse.util.messages.MessagesFactory;
+import org.apache.muse.util.xml.XmlSerializable;
+import org.apache.muse.util.xml.XmlUtils;
+import org.apache.muse.ws.notification.WsnConstants;
+import org.apache.muse.ws.notification.topics.WstConstants;
+
+/**
+ *
+ * GetCurrentMessage is a serializer/deserializer for the WS-Notification 
+ * GetCurrentMessage operation's request content.
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ */
+
+public class GetCurrentMessage implements XmlSerializable
+{
+    private static Messages _MESSAGES = MessagesFactory.get(GetCurrentMessage.class);
+    
+    private QName _topicPath = null;
+    
+    public GetCurrentMessage(Element xml)
+    {
+        _topicPath = XmlUtils.getQNameFromChild(xml, WsnConstants.TOPIC_QNAME);
+    }
+    
+    public GetCurrentMessage(QName topicPath)
+    {
+        _topicPath = topicPath;
+    }
+    
+    protected String getDialect(String name)
+    {
+        return name.indexOf('/') >= 0 ? WstConstants.CONCRETE_TOPIC_URI : WstConstants.SIMPLE_TOPIC_URI;
+    }
+    
+    public QName getTopicPath()
+    {
+        return _topicPath;
+    }
+    
+    public Element toXML()
+    {
+        return toXML(XmlUtils.EMPTY_DOC);
+    }
+    
+    public Element toXML(Document doc)
+    {
+        if (doc == null)
+            throw new NullPointerException(_MESSAGES.get("NullDocument"));
+        
+        Element root = XmlUtils.createElement(doc, WsnConstants.GET_CURRENT_QNAME);
+        Element topic = XmlUtils.createElement(doc, WsnConstants.TOPIC_QNAME, getTopicPath());
+                
+        String dialect = getDialect(_topicPath.getLocalPart());
+        topic.setAttribute(WsnConstants.DIALECT, dialect);
+        
+        root.appendChild(topic);
+        return root;
+    }
+}

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessageHandler.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessageHandler.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessageHandler.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessageHandler.java Sat Mar 24 06:18:52 2007
@@ -1,52 +1,56 @@
-/*=============================================================================*
- *  Copyright 2007 The Apache Software Foundation
- *
- *  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.
- *=============================================================================*/
-
-package org.apache.muse.ws.notification.impl;
-
-import org.w3c.dom.Element;
-
-import org.apache.muse.core.routing.AbstractMessageHandler;
-import org.apache.muse.ws.notification.NotificationMessage;
-import org.apache.muse.ws.notification.WsnConstants;
-
-/**
-*
-* GetCurrentHandler is the parser for the WS-Notification GetCurrentMessage operation.
-* 
-* @author Dan Jemiolo (danj)
-* 
-*/
-
-public class GetCurrentMessageHandler extends AbstractMessageHandler
-{
-   public GetCurrentMessageHandler()
-   {
-       super(WsnConstants.GET_CURRENT_URI, WsnConstants.GET_CURRENT_QNAME);
-   }
-   
-   public Object[] fromXML(Element xml)
-   {
-       GetCurrentMessage get = new GetCurrentMessage(xml);
-       return new Object[]{ get.getTopicPath() };
-   }
-
-   public Element toXML(Object result)
-   {
-       NotificationMessage message = (NotificationMessage)result;
-       GetCurrentMessageResponse response = new GetCurrentMessageResponse(message);
-       return response.toXML();
-   }
-}
+/* 
+ * 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.muse.ws.notification.impl;
+
+import org.w3c.dom.Element;
+
+import org.apache.muse.core.routing.AbstractMessageHandler;
+import org.apache.muse.ws.notification.NotificationMessage;
+import org.apache.muse.ws.notification.WsnConstants;
+
+/**
+*
+* GetCurrentHandler is the parser for the WS-Notification GetCurrentMessage operation.
+* 
+* @author Dan Jemiolo (danj)
+* 
+*/
+
+public class GetCurrentMessageHandler extends AbstractMessageHandler
+{
+   public GetCurrentMessageHandler()
+   {
+       super(WsnConstants.GET_CURRENT_URI, WsnConstants.GET_CURRENT_QNAME);
+   }
+   
+   public Object[] fromXML(Element xml)
+   {
+       GetCurrentMessage get = new GetCurrentMessage(xml);
+       return new Object[]{ get.getTopicPath() };
+   }
+
+   public Element toXML(Object result)
+   {
+       NotificationMessage message = (NotificationMessage)result;
+       GetCurrentMessageResponse response = new GetCurrentMessageResponse(message);
+       return response.toXML();
+   }
+}

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessageResponse.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessageResponse.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessageResponse.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/GetCurrentMessageResponse.java Sat Mar 24 06:18:52 2007
@@ -1,84 +1,88 @@
-/*=============================================================================*
- *  Copyright 2007 The Apache Software Foundation
- *
- *  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.
- *=============================================================================*/
-
-package org.apache.muse.ws.notification.impl;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import org.apache.muse.util.messages.Messages;
-import org.apache.muse.util.messages.MessagesFactory;
-import org.apache.muse.util.xml.XmlSerializable;
-import org.apache.muse.util.xml.XmlUtils;
-import org.apache.muse.ws.addressing.soap.SoapFault;
-import org.apache.muse.ws.notification.NotificationMessage;
-import org.apache.muse.ws.notification.WsnConstants;
-
-/**
- *
- * GetCurrentMessageResponse is a serializer/deserializer for the WS-Notification 
- * GetCurrentMessage operation's response content.
- *
- * @author Dan Jemiolo (danj)
- *
- */
-
-public class GetCurrentMessageResponse implements XmlSerializable
-{
-    private static Messages _MESSAGES = MessagesFactory.get(GetCurrentMessageResponse.class);
-    
-    private NotificationMessage _message = null;
-    
-    public GetCurrentMessageResponse(Element xml) 
-        throws SoapFault
-    {
-        Element messageXML = XmlUtils.getFirstElement(xml);
-        
-        if (messageXML != null)
-            _message = new SimpleNotificationMessage(messageXML);
-    }
-    
-    public GetCurrentMessageResponse(NotificationMessage message)
-    {
-        _message = message;
-    }
-    
-    public NotificationMessage getMessage()
-    {
-        return _message;
-    }
-    
-    public Element toXML()
-    {
-        return toXML(XmlUtils.EMPTY_DOC);
-    }
-    
-    public Element toXML(Document doc)
-    {
-        if (doc == null)
-            throw new NullPointerException(_MESSAGES.get("NullDocument"));
-        
-        Element root = XmlUtils.createElement(doc, WsnConstants.GET_CURRENT_RESPONSE_QNAME);
-        
-        if (_message != null)
-        {
-            Element messageXML = _message.toXML(doc);
-            root.appendChild(messageXML);
-        }
-        
-        return root;
-    }
-}
+/* 
+ * 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.muse.ws.notification.impl;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import org.apache.muse.util.messages.Messages;
+import org.apache.muse.util.messages.MessagesFactory;
+import org.apache.muse.util.xml.XmlSerializable;
+import org.apache.muse.util.xml.XmlUtils;
+import org.apache.muse.ws.addressing.soap.SoapFault;
+import org.apache.muse.ws.notification.NotificationMessage;
+import org.apache.muse.ws.notification.WsnConstants;
+
+/**
+ *
+ * GetCurrentMessageResponse is a serializer/deserializer for the WS-Notification 
+ * GetCurrentMessage operation's response content.
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ */
+
+public class GetCurrentMessageResponse implements XmlSerializable
+{
+    private static Messages _MESSAGES = MessagesFactory.get(GetCurrentMessageResponse.class);
+    
+    private NotificationMessage _message = null;
+    
+    public GetCurrentMessageResponse(Element xml) 
+        throws SoapFault
+    {
+        Element messageXML = XmlUtils.getFirstElement(xml);
+        
+        if (messageXML != null)
+            _message = new SimpleNotificationMessage(messageXML);
+    }
+    
+    public GetCurrentMessageResponse(NotificationMessage message)
+    {
+        _message = message;
+    }
+    
+    public NotificationMessage getMessage()
+    {
+        return _message;
+    }
+    
+    public Element toXML()
+    {
+        return toXML(XmlUtils.EMPTY_DOC);
+    }
+    
+    public Element toXML(Document doc)
+    {
+        if (doc == null)
+            throw new NullPointerException(_MESSAGES.get("NullDocument"));
+        
+        Element root = XmlUtils.createElement(doc, WsnConstants.GET_CURRENT_RESPONSE_QNAME);
+        
+        if (_message != null)
+        {
+            Element messageXML = _message.toXML(doc);
+            root.appendChild(messageXML);
+        }
+        
+        return root;
+    }
+}

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilter.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilter.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilter.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilter.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.impl;
 

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilterHandler.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilterHandler.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilterHandler.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilterHandler.java Sat Mar 24 06:18:52 2007
@@ -1,51 +1,55 @@
-/*=============================================================================*
- *  Copyright 2007 The Apache Software Foundation
- *
- *  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.
- *=============================================================================*/
-
-package org.apache.muse.ws.notification.impl;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import org.apache.muse.util.xml.XPathUtils;
-import org.apache.muse.util.xml.XmlUtils;
-import org.apache.muse.ws.notification.Filter;
-import org.apache.muse.ws.notification.WsnConstants;
-import org.apache.muse.ws.resource.basefaults.BaseFault;
-
-/**
- *
- * @author Dan Jemiolo (danj)
- *
- */
-
-public class MessagePatternFilterHandler implements FilterFactoryHandler
-{
-    public boolean accepts(QName filterName, String filterDialect)
-    {
-        boolean rightName = filterName.equals(WsnConstants.MESSAGE_CONTENT_QNAME);
-        boolean rightDialect = filterDialect.equals(XPathUtils.NAMESPACE_URI);
-        return rightName && rightDialect;
-    }
-    
-    public Filter newInstance(Element filterXML)
-        throws BaseFault
-    {
-        String dialect = filterXML.getAttribute(WsnConstants.DIALECT);
-        String pattern = XmlUtils.extractText(filterXML);
-        return new MessagePatternFilter(pattern, dialect);
-    }
-}
+/* 
+ * 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.muse.ws.notification.impl;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+import org.apache.muse.util.xml.XPathUtils;
+import org.apache.muse.util.xml.XmlUtils;
+import org.apache.muse.ws.notification.Filter;
+import org.apache.muse.ws.notification.WsnConstants;
+import org.apache.muse.ws.resource.basefaults.BaseFault;
+
+/**
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ */
+
+public class MessagePatternFilterHandler implements FilterFactoryHandler
+{
+    public boolean accepts(QName filterName, String filterDialect)
+    {
+        boolean rightName = filterName.equals(WsnConstants.MESSAGE_CONTENT_QNAME);
+        boolean rightDialect = filterDialect.equals(XPathUtils.NAMESPACE_URI);
+        return rightName && rightDialect;
+    }
+    
+    public Filter newInstance(Element filterXML)
+        throws BaseFault
+    {
+        String dialect = filterXML.getAttribute(WsnConstants.DIALECT);
+        String pattern = XmlUtils.extractText(filterXML);
+        return new MessagePatternFilter(pattern, dialect);
+    }
+}

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotificationMessageSerializer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotificationMessageSerializer.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotificationMessageSerializer.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotificationMessageSerializer.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.impl;
 

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotificationProducerFilePersistence.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotificationProducerFilePersistence.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotificationProducerFilePersistence.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotificationProducerFilePersistence.java Sat Mar 24 06:18:52 2007
@@ -1,138 +1,142 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
- *
- *  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.
- *=============================================================================*/
- 
-package org.apache.muse.ws.notification.impl;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.w3c.dom.Element;
-
-import org.apache.muse.core.AbstractFilePersistence;
-import org.apache.muse.core.Resource;
-import org.apache.muse.util.xml.XmlUtils;
-import org.apache.muse.ws.addressing.EndpointReference;
-import org.apache.muse.ws.addressing.soap.SoapFault;
-import org.apache.muse.ws.notification.Filter;
-import org.apache.muse.ws.notification.NotificationProducer;
-import org.apache.muse.ws.notification.NotificationProducerPersistence;
-import org.apache.muse.ws.notification.SubscriptionManager;
-import org.apache.muse.ws.notification.WsnConstants;
-import org.apache.muse.ws.resource.WsResource;
-
-/**
- * 
- * NotificationProducerFilePersistence is an implementation of file-based 
- * persistence of subscription resource data. It stores data about current 
- * subscription resources on disk and then re-loads them after an application 
- * restarts. This allows the producer resource to continue functioning as it was 
- * before the restart without the application having to notify all subscribers 
- * and have them re-subscribe.
- *
- * @author Dan Jemiolo (danj)
- *
- */
-
-public class NotificationProducerFilePersistence 
-    extends AbstractFilePersistence implements NotificationProducerPersistence
-{
-    private NotificationProducer _producer = null;
-    
-    protected void createResourceFile(EndpointReference epr, Resource resource, File resourceFile) 
-        throws SoapFault
-    {
-        //
-        // write subscription ws-rp doc to file
-        //
-        SubscriptionManager sub = (SubscriptionManager)resource.getCapability(WsnConstants.SUBSCRIPTION_MGR_URI);
-        Element subXML = sub.toXML();
-        
-        try
-        {
-            XmlUtils.toFile(subXML, resourceFile);
-        }
-        
-        catch (IOException error)
-        {
-            throw new SoapFault(error);
-        }
-    }
-    
-    protected String getFilePrefix()
-    {
-        return "subscription-";
-    }
-
-    public NotificationProducer getNotificationProducer()
-    {
-        return _producer;
-    }
-    
-    protected Resource reloadResource(String contextPath, Element resourceXML) 
-        throws SoapFault
-    {
-        //
-        // get the EPR of the entry resource so we can look it up
-        //
-        Element subEprXML = XmlUtils.getElement(resourceXML, WsnConstants.SUBSCRIPTION_EPR_QNAME);
-        EndpointReference subEPR = new EndpointReference(subEprXML);
-        
-        //
-        // get properties of the subscription so we can add them back to 
-        // the resource instance
-        //
-        Element consumerEprXML = XmlUtils.getElement(resourceXML, WsnConstants.CONSUMER_QNAME);
-        EndpointReference consumerEPR = new EndpointReference(consumerEprXML);
-        
-        Element producerEprXML = XmlUtils.getElement(resourceXML, WsnConstants.PRODUCER_QNAME);
-        EndpointReference producerEPR = new EndpointReference(producerEprXML);
-        
-        Element filterXML = XmlUtils.getElement(resourceXML, WsnConstants.FILTER_QNAME);
-        Filter filter = FilterFactory.getInstance().newInstance(filterXML);
-        
-        //
-        // find the subscription resource, use the SubscriptionManager capability 
-        // to set property values
-        //
-        WsResource subResource = (WsResource)getResourceManager().getResource(subEPR);
-        SubscriptionManager sub = (SubscriptionManager)subResource.getCapability(WsnConstants.SUBSCRIPTION_MGR_URI);
-        
-        sub.setConsumerReference(consumerEPR);
-        sub.setProducerReference(producerEPR);
-        sub.setFilter(filter);
-        
-        getNotificationProducer().addSubscription(subResource);
-        
-        return subResource;
-    }
-    
-    public void resourceAdded(EndpointReference epr, Resource resource) 
-        throws SoapFault
-    {
-        createResourceFile(epr, resource);
-    }
-
-    public void resourceRemoved(EndpointReference epr)
-        throws SoapFault
-    {
-        destroyResourceFile(epr);
-    }
-
-    public void setNotificationProducer(NotificationProducer producer)
-    {
-        _producer = producer;
-    }
-}
+/* 
+ * 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.muse.ws.notification.impl;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.w3c.dom.Element;
+
+import org.apache.muse.core.AbstractFilePersistence;
+import org.apache.muse.core.Resource;
+import org.apache.muse.util.xml.XmlUtils;
+import org.apache.muse.ws.addressing.EndpointReference;
+import org.apache.muse.ws.addressing.soap.SoapFault;
+import org.apache.muse.ws.notification.Filter;
+import org.apache.muse.ws.notification.NotificationProducer;
+import org.apache.muse.ws.notification.NotificationProducerPersistence;
+import org.apache.muse.ws.notification.SubscriptionManager;
+import org.apache.muse.ws.notification.WsnConstants;
+import org.apache.muse.ws.resource.WsResource;
+
+/**
+ * 
+ * NotificationProducerFilePersistence is an implementation of file-based 
+ * persistence of subscription resource data. It stores data about current 
+ * subscription resources on disk and then re-loads them after an application 
+ * restarts. This allows the producer resource to continue functioning as it was 
+ * before the restart without the application having to notify all subscribers 
+ * and have them re-subscribe.
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ */
+
+public class NotificationProducerFilePersistence 
+    extends AbstractFilePersistence implements NotificationProducerPersistence
+{
+    private NotificationProducer _producer = null;
+    
+    protected void createResourceFile(EndpointReference epr, Resource resource, File resourceFile) 
+        throws SoapFault
+    {
+        //
+        // write subscription ws-rp doc to file
+        //
+        SubscriptionManager sub = (SubscriptionManager)resource.getCapability(WsnConstants.SUBSCRIPTION_MGR_URI);
+        Element subXML = sub.toXML();
+        
+        try
+        {
+            XmlUtils.toFile(subXML, resourceFile);
+        }
+        
+        catch (IOException error)
+        {
+            throw new SoapFault(error);
+        }
+    }
+    
+    protected String getFilePrefix()
+    {
+        return "subscription-";
+    }
+
+    public NotificationProducer getNotificationProducer()
+    {
+        return _producer;
+    }
+    
+    protected Resource reloadResource(String contextPath, Element resourceXML) 
+        throws SoapFault
+    {
+        //
+        // get the EPR of the entry resource so we can look it up
+        //
+        Element subEprXML = XmlUtils.getElement(resourceXML, WsnConstants.SUBSCRIPTION_EPR_QNAME);
+        EndpointReference subEPR = new EndpointReference(subEprXML);
+        
+        //
+        // get properties of the subscription so we can add them back to 
+        // the resource instance
+        //
+        Element consumerEprXML = XmlUtils.getElement(resourceXML, WsnConstants.CONSUMER_QNAME);
+        EndpointReference consumerEPR = new EndpointReference(consumerEprXML);
+        
+        Element producerEprXML = XmlUtils.getElement(resourceXML, WsnConstants.PRODUCER_QNAME);
+        EndpointReference producerEPR = new EndpointReference(producerEprXML);
+        
+        Element filterXML = XmlUtils.getElement(resourceXML, WsnConstants.FILTER_QNAME);
+        Filter filter = FilterFactory.getInstance().newInstance(filterXML);
+        
+        //
+        // find the subscription resource, use the SubscriptionManager capability 
+        // to set property values
+        //
+        WsResource subResource = (WsResource)getResourceManager().getResource(subEPR);
+        SubscriptionManager sub = (SubscriptionManager)subResource.getCapability(WsnConstants.SUBSCRIPTION_MGR_URI);
+        
+        sub.setConsumerReference(consumerEPR);
+        sub.setProducerReference(producerEPR);
+        sub.setFilter(filter);
+        
+        getNotificationProducer().addSubscription(subResource);
+        
+        return subResource;
+    }
+    
+    public void resourceAdded(EndpointReference epr, Resource resource) 
+        throws SoapFault
+    {
+        createResourceFile(epr, resource);
+    }
+
+    public void resourceRemoved(EndpointReference epr)
+        throws SoapFault
+    {
+        destroyResourceFile(epr);
+    }
+
+    public void setNotificationProducer(NotificationProducer producer)
+    {
+        _producer = producer;
+    }
+}

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotifyHandler.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotifyHandler.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotifyHandler.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/NotifyHandler.java Sat Mar 24 06:18:52 2007
@@ -1,66 +1,70 @@
-/*=============================================================================*
- *  Copyright 2007 The Apache Software Foundation
- *
- *  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.
- *=============================================================================*/
-
-package org.apache.muse.ws.notification.impl;
-
-import org.w3c.dom.Element;
-
-import org.apache.muse.core.routing.AbstractMessageHandler;
-import org.apache.muse.core.serializer.Serializer;
-import org.apache.muse.core.serializer.SerializerRegistry;
-import org.apache.muse.util.xml.XmlUtils;
-import org.apache.muse.ws.addressing.soap.SoapFault;
-import org.apache.muse.ws.notification.NotificationMessage;
-import org.apache.muse.ws.notification.WsnConstants;
-
-/**
- *
- * NotifyHandler is the parser for the WS-Notification Notify operation.
- *
- * @author Dan Jemiolo (danj)
- *
- */
-
-public class NotifyHandler extends AbstractMessageHandler
-{
-    //
-    // Response message never changes, so we use a static value
-    //
-    private static final Element _NOTIFY_RESPONSE = XmlUtils.createElement(WsnConstants.NOTIFY_RESPONSE_QNAME);
-    
-    public NotifyHandler()
-    {
-        super(WsnConstants.NOTIFY_URI, WsnConstants.NOTIFY_QNAME);
-    }
-    
-    public Object[] fromXML(Element xml) 
-        throws SoapFault
-    {
-        //
-        // use the Muse serializer framework to convert <Notify/> into 
-        // an array of NotificationMessage objects
-        //
-        SerializerRegistry registry = SerializerRegistry.getInstance();
-        Serializer ser = registry.getSerializer(NotificationMessage[].class);
-        Object messageArray = ser.fromXML(xml);
-        return new Object[]{ messageArray };
-    }
-    
-    public Element toXML(Object result)
-    {
-        return _NOTIFY_RESPONSE;
-    }
-}
+/* 
+ * 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.muse.ws.notification.impl;
+
+import org.w3c.dom.Element;
+
+import org.apache.muse.core.routing.AbstractMessageHandler;
+import org.apache.muse.core.serializer.Serializer;
+import org.apache.muse.core.serializer.SerializerRegistry;
+import org.apache.muse.util.xml.XmlUtils;
+import org.apache.muse.ws.addressing.soap.SoapFault;
+import org.apache.muse.ws.notification.NotificationMessage;
+import org.apache.muse.ws.notification.WsnConstants;
+
+/**
+ *
+ * NotifyHandler is the parser for the WS-Notification Notify operation.
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ */
+
+public class NotifyHandler extends AbstractMessageHandler
+{
+    //
+    // Response message never changes, so we use a static value
+    //
+    private static final Element _NOTIFY_RESPONSE = XmlUtils.createElement(WsnConstants.NOTIFY_RESPONSE_QNAME);
+    
+    public NotifyHandler()
+    {
+        super(WsnConstants.NOTIFY_URI, WsnConstants.NOTIFY_QNAME);
+    }
+    
+    public Object[] fromXML(Element xml) 
+        throws SoapFault
+    {
+        //
+        // use the Muse serializer framework to convert <Notify/> into 
+        // an array of NotificationMessage objects
+        //
+        SerializerRegistry registry = SerializerRegistry.getInstance();
+        Serializer ser = registry.getSerializer(NotificationMessage[].class);
+        Object messageArray = ser.fromXML(xml);
+        return new Object[]{ messageArray };
+    }
+    
+    public Element toXML(Object result)
+    {
+        return _NOTIFY_RESPONSE;
+    }
+}

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/ProducerPropertiesFilter.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/ProducerPropertiesFilter.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/ProducerPropertiesFilter.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/ProducerPropertiesFilter.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.impl;
 

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/ProducerPropertiesFilterHandler.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/ProducerPropertiesFilterHandler.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/ProducerPropertiesFilterHandler.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/ProducerPropertiesFilterHandler.java Sat Mar 24 06:18:52 2007
@@ -1,51 +1,55 @@
-/*=============================================================================*
- *  Copyright 2007 The Apache Software Foundation
- *
- *  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.
- *=============================================================================*/
-
-package org.apache.muse.ws.notification.impl;
-
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Element;
-
-import org.apache.muse.util.xml.XPathUtils;
-import org.apache.muse.util.xml.XmlUtils;
-import org.apache.muse.ws.notification.Filter;
-import org.apache.muse.ws.notification.WsnConstants;
-import org.apache.muse.ws.resource.basefaults.BaseFault;
-
-/**
- *
- * @author Dan Jemiolo (danj)
- *
- */
-
-public class ProducerPropertiesFilterHandler implements FilterFactoryHandler
-{
-    public boolean accepts(QName filterName, String filterDialect)
-    {
-        boolean rightName = filterName.equals(WsnConstants.PRODUCER_PROPERTIES_QNAME);
-        boolean rightDialect = filterDialect.equals(XPathUtils.NAMESPACE_URI);
-        return rightName && rightDialect;
-    }
-    
-    public Filter newInstance(Element filterXML)
-        throws BaseFault
-    {
-        String dialect = filterXML.getAttribute(WsnConstants.DIALECT);
-        String expression = XmlUtils.extractText(filterXML);
-        return new ProducerPropertiesFilter(expression, dialect);
-    }
-}
+/* 
+ * 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.muse.ws.notification.impl;
+
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Element;
+
+import org.apache.muse.util.xml.XPathUtils;
+import org.apache.muse.util.xml.XmlUtils;
+import org.apache.muse.ws.notification.Filter;
+import org.apache.muse.ws.notification.WsnConstants;
+import org.apache.muse.ws.resource.basefaults.BaseFault;
+
+/**
+ *
+ * @author Dan Jemiolo (danj)
+ *
+ */
+
+public class ProducerPropertiesFilterHandler implements FilterFactoryHandler
+{
+    public boolean accepts(QName filterName, String filterDialect)
+    {
+        boolean rightName = filterName.equals(WsnConstants.PRODUCER_PROPERTIES_QNAME);
+        boolean rightDialect = filterDialect.equals(XPathUtils.NAMESPACE_URI);
+        return rightName && rightDialect;
+    }
+    
+    public Filter newInstance(Element filterXML)
+        throws BaseFault
+    {
+        String dialect = filterXML.getAttribute(WsnConstants.DIALECT);
+        String expression = XmlUtils.extractText(filterXML);
+        return new ProducerPropertiesFilter(expression, dialect);
+    }
+}

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/PublishAllMessagesFilter.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/PublishAllMessagesFilter.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/PublishAllMessagesFilter.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/PublishAllMessagesFilter.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.impl;
 

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationConsumer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationConsumer.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationConsumer.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationConsumer.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.impl;
 

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationMessage.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationMessage.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationMessage.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationMessage.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.impl;
 

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationProducer.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationProducer.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationProducer.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationProducer.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.impl;
 

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPoint.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPoint.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPoint.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPoint.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.impl;
 

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPointCreation.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPointCreation.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPointCreation.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPointCreation.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.impl;
 

Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPointDataStore.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPointDataStore.java?view=diff&rev=522022&r1=522021&r2=522022
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPointDataStore.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimplePullPointDataStore.java Sat Mar 24 06:18:52 2007
@@ -1,18 +1,22 @@
-/*=============================================================================*
- *  Copyright 2006 The Apache Software Foundation
+/* 
+ * 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.
  *
- *  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.
- *=============================================================================*/
+ */
 
 package org.apache.muse.ws.notification.impl;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org