From musejasmine05@example.org Mon Jul 10 02:46:55 2006 Return-Path: <musejasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 71865 invoked from network); 10 Jul 2006 02:46:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 10 Jul 2006 02:46:55 -0000 Received: (qmail 67115 invoked by uid 500); 10 Jul 2006 02:46:55 -0000 Delivered-To: jasmine05@example.org Received: (qmail 67092 invoked by uid 500); 10 Jul 2006 02:46:54 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <muse-commits.ws.apache.org> Reply-To: jasmine05@example.org Delivered-To: mailing list jasmine05@example.org Received: (qmail 67081 invoked by uid 500); 10 Jul 2006 02:46:54 -0000 Delivered-To: jasmine05@example.org Received: (qmail 67078 invoked by uid 99); 10 Jul 2006 02:46:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Jul 2006 19:46:54 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Jul 2006 19:46:54 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 066CC1A981A; Sun, 9 Jul 2006 19:46:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420405 - /webservices/muse/site/index.html Date: Mon, 10 Jul 2006 02:46:33 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: danj Date: Sun Jul 9 19:46:33 2006 New Revision: 420405 URL: http://svn.apache.org/viewvc?rev=420405&view=rev Log: Updated news section to include new conf call info and a link to our milestone schedule. Modified: webservices/muse/site/index.html Modified: webservices/muse/site/index.html URL: http://svn.apache.org/viewvc/webservices/muse/site/index.html?rev=420405&r1=420404&r2=420405&view=diff ============================================================================== --- webservices/muse/site/index.html (original) +++ webservices/muse/site/index.html Sun Jul 9 19:46:33 2006 @@ -155,6 +155,17 @@ Recent happenings in the Muse community: <blockquote> +<strong>[ July 1, 2006 ]</strong> The Muse development team +<a class="external" href="http://marc.theaimsgroup.com/?l=muse-dev&m=115169512401559&w=2">has agreed</a> +to a milestone a release schedule for the rest of summer and early fall. Milestone #2 should be published +on August 4th! +<br/><br/> + +<strong>[ July 1, 2006 ]</strong> The day and time for our weekly conference calls +<a class="external" href="http://marc.theaimsgroup.com/?l=muse-dev&m=115222201804746&w=2">has been updated</a> +to Thursdays, 11:00 a.m. to 12:30 p.m. Eastern US (the calls are sequential). +<br/><br/> + <strong>[ June 30, 2006 ]</strong> <a href="release.html#v2.0.0">Muse 2.0.0 Milestone #1</a> is now available! This milestone is aimed at development teams who want to get a better idea of where Muse is going or who would like to contribute to the new code base. Much credit belongs to the Muse 1.0 developers who @@ -166,7 +177,7 @@ updated to reflect the changes between 1.0 to 2.0. Nightly snapshots will be available shortly.<br/><br/> <strong>[ June 9, 2006 ]</strong> The first weekly status call between Muse 2.0 developers is held - newcomers -are welcome to <a class="external" href="http://marc.theaimsgroup.com/?l=muse-dev&m=114927142701490&w=2">join the call</a> +are welcome to <a class="external" href="http://marc.theaimsgroup.com/?l=muse-dev&m=115222201804746&w=2">join the call</a> if they are interested in making a contribution.<br/><br/> <strong>[ June 2, 2006 ]</strong> The first <a class="external" href="http://marc.theaimsgroup.com/?l=muse-dev&m=114917278003490&w=2">conference --------------------------------------------------------------------- To unsubscribe, e-mail: jasmine05@example.org For additional commands, e-mail: jasmine05@example.org From musejasmine05@example.org Mon Jul 10 12:54:58 2006 Return-Path: <musejasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 65427 invoked from network); 10 Jul 2006 12:54:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 10 Jul 2006 12:54:58 -0000 Received: (qmail 58233 invoked by uid 500); 10 Jul 2006 12:54:58 -0000 Delivered-To: jasmine05@example.org Received: (qmail 58205 invoked by uid 500); 10 Jul 2006 12:54:58 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <muse-commits.ws.apache.org> Reply-To: jasmine05@example.org Delivered-To: mailing list jasmine05@example.org Received: (qmail 58194 invoked by uid 500); 10 Jul 2006 12:54:58 -0000 Delivered-To: jasmine05@example.org Received: (qmail 58191 invoked by uid 99); 10 Jul 2006 12:54:58 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 05:54:58 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 05:54:57 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id A322E1A981A; Mon, 10 Jul 2006 05:54:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420516 - /webservices/muse/site/issue_tracking.html Date: Mon, 10 Jul 2006 12:54:37 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: danj Date: Mon Jul 10 05:54:36 2006 New Revision: 420516 URL: http://svn.apache.org/viewvc?rev=420516&view=rev Log: Fixed JIRA hyperlink URL Modified: webservices/muse/site/issue_tracking.html Modified: webservices/muse/site/issue_tracking.html URL: http://svn.apache.org/viewvc/webservices/muse/site/issue_tracking.html?rev=420516&r1=420515&r2=420516&view=diff ============================================================================== --- webservices/muse/site/issue_tracking.html (original) +++ webservices/muse/site/issue_tracking.html Mon Jul 10 05:54:36 2006 @@ -136,7 +136,7 @@ <p> Muse issues (bugs, as well as enhancement requests) are tracked in - Apache JIRA <a class="external" href="http://nagoya.apache.org/jira/browse/Muse">here</a>. + Apache JIRA <a class="external" href="http://issues.apache.org/jira/browse/MUSE">here</a>. If you aren't sure whether something is a bug, post a question on the Muse <a href="contact_info.html">mailing list</a>. </p> --------------------------------------------------------------------- To unsubscribe, e-mail: jasmine05@example.org For additional commands, e-mail: jasmine05@example.org From musejasmine05@example.org Mon Jul 10 20:39:17 2006 Return-Path: <musejasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 68953 invoked from network); 10 Jul 2006 20:39:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 10 Jul 2006 20:39:16 -0000 Received: (qmail 53991 invoked by uid 500); 10 Jul 2006 20:39:15 -0000 Delivered-To: jasmine05@example.org Received: (qmail 53963 invoked by uid 500); 10 Jul 2006 20:39:15 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <muse-commits.ws.apache.org> Reply-To: jasmine05@example.org Delivered-To: mailing list jasmine05@example.org Received: (qmail 53938 invoked by uid 500); 10 Jul 2006 20:39:15 -0000 Delivered-To: jasmine05@example.org Received: (qmail 53929 invoked by uid 99); 10 Jul 2006 20:39:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 13:39:15 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 13:39:13 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E04BF1A981A; Mon, 10 Jul 2006 13:38:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420628 - in /webservices/muse/trunk: ./ modules/muse-core/ modules/muse-platform-axis2/ modules/muse-tools/ modules/muse-util-qname/ modules/muse-util-xml/ modules/muse-util-xstream/ modules/muse-util/ modules/muse-wsa-soap/ modules/muse-w... Date: Mon, 10 Jul 2006 20:38:48 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: danj Date: Mon Jul 10 13:38:47 2006 New Revision: 420628 URL: http://svn.apache.org/viewvc?rev=420628&view=rev Log: Updated Maven build files from M1 to M2. Modified: webservices/muse/trunk/modules/muse-core/pom.xml webservices/muse/trunk/modules/muse-platform-axis2/pom.xml webservices/muse/trunk/modules/muse-tools/pom.xml webservices/muse/trunk/modules/muse-util-qname/pom.xml webservices/muse/trunk/modules/muse-util-xml/pom.xml webservices/muse/trunk/modules/muse-util-xstream/pom.xml webservices/muse/trunk/modules/muse-util/pom.xml webservices/muse/trunk/modules/muse-wsa-soap/pom.xml webservices/muse/trunk/modules/muse-wsdm-muws-adv/pom-api.xml webservices/muse/trunk/modules/muse-wsdm-muws-adv/pom-impl.xml webservices/muse/trunk/modules/muse-wsdm-muws/pom-api.xml webservices/muse/trunk/modules/muse-wsdm-muws/pom-impl.xml webservices/muse/trunk/modules/muse-wsdm-wef/pom-api.xml webservices/muse/trunk/modules/muse-wsdm-wef/pom-impl.xml webservices/muse/trunk/modules/muse-wsn/pom-api.xml webservices/muse/trunk/modules/muse-wsn/pom-impl.xml webservices/muse/trunk/modules/muse-wsrf/pom-api.xml webservices/muse/trunk/modules/muse-wsrf/pom-impl.xml webservices/muse/trunk/modules/muse-wsx/pom-api.xml webservices/muse/trunk/modules/muse-wsx/pom-impl.xml webservices/muse/trunk/sign-release.bat Modified: webservices/muse/trunk/modules/muse-core/pom.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/pom.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-core/pom.xml (original) +++ webservices/muse/trunk/modules/muse-core/pom.xml Mon Jul 10 13:38:47 2006 @@ -6,32 +6,32 @@ <groupId>muse</groupId> <artifactId>muse-core</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - Deployment Engine and Core API</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-util</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> Modified: webservices/muse/trunk/modules/muse-platform-axis2/pom.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-platform-axis2/pom.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-platform-axis2/pom.xml (original) +++ webservices/muse/trunk/modules/muse-platform-axis2/pom.xml Mon Jul 10 13:38:47 2006 @@ -6,26 +6,26 @@ <groupId>muse</groupId> <artifactId>muse-platform-axis2</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - Axis2 Deployment</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> Modified: webservices/muse/trunk/modules/muse-tools/pom.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-tools/pom.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-tools/pom.xml (original) +++ webservices/muse/trunk/modules/muse-tools/pom.xml Mon Jul 10 13:38:47 2006 @@ -6,62 +6,62 @@ <groupId>muse</groupId> <artifactId>muse-tools</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - CLI Tools</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-util</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-impl</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsn-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsn-impl</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> Modified: webservices/muse/trunk/modules/muse-util-qname/pom.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-util-qname/pom.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-util-qname/pom.xml (original) +++ webservices/muse/trunk/modules/muse-util-qname/pom.xml Mon Jul 10 13:38:47 2006 @@ -6,7 +6,7 @@ <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - QName for JDK 1.4.x</name> <url>http://ws.apache.org/muse</url> <build> Modified: webservices/muse/trunk/modules/muse-util-xml/pom.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-util-xml/pom.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-util-xml/pom.xml (original) +++ webservices/muse/trunk/modules/muse-util-xml/pom.xml Mon Jul 10 13:38:47 2006 @@ -6,14 +6,14 @@ <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - XML Utilities</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> Modified: webservices/muse/trunk/modules/muse-util-xstream/pom.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-util-xstream/pom.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-util-xstream/pom.xml (original) +++ webservices/muse/trunk/modules/muse-util-xstream/pom.xml Mon Jul 10 13:38:47 2006 @@ -6,32 +6,32 @@ <groupId>muse</groupId> <artifactId>muse-util-xstream</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - XStream Serialization</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> Modified: webservices/muse/trunk/modules/muse-util/pom.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-util/pom.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-util/pom.xml (original) +++ webservices/muse/trunk/modules/muse-util/pom.xml Mon Jul 10 13:38:47 2006 @@ -6,14 +6,14 @@ <groupId>muse</groupId> <artifactId>muse-util</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - Miscellaneous Utilities</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsa-soap/pom.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsa-soap/pom.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsa-soap/pom.xml (original) +++ webservices/muse/trunk/modules/muse-wsa-soap/pom.xml Mon Jul 10 13:38:47 2006 @@ -6,26 +6,26 @@ <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WS-Addressing 1.0 and SOAP 1.2 APIs</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-util</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsdm-muws-adv/pom-api.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws-adv/pom-api.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsdm-muws-adv/pom-api.xml (original) +++ webservices/muse/trunk/modules/muse-wsdm-muws-adv/pom-api.xml Mon Jul 10 13:38:47 2006 @@ -6,38 +6,38 @@ <groupId>muse</groupId> <artifactId>muse-wsdm-muws-adv-api</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WSDM MUWS 1.1 Advertisement API</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsdm-muws-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsdm-muws-adv/pom-impl.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws-adv/pom-impl.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsdm-muws-adv/pom-impl.xml (original) +++ webservices/muse/trunk/modules/muse-wsdm-muws-adv/pom-impl.xml Mon Jul 10 13:38:47 2006 @@ -6,86 +6,86 @@ <groupId>muse</groupId> <artifactId>muse-wsdm-muws-adv-impl</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WSDM MUWS 1.1 Advertisement Default Implementation</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-impl</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsn-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsn-impl</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsdm-wef-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsdm-wef-impl</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsdm-muws-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsdm-muws-adv-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsdm-muws/pom-api.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws/pom-api.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsdm-muws/pom-api.xml (original) +++ webservices/muse/trunk/modules/muse-wsdm-muws/pom-api.xml Mon Jul 10 13:38:47 2006 @@ -6,32 +6,32 @@ <groupId>muse</groupId> <artifactId>muse-wsdm-muws-api</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WSDM MUWS 1.1 API</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsdm-muws/pom-impl.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws/pom-impl.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsdm-muws/pom-impl.xml (original) +++ webservices/muse/trunk/modules/muse-wsdm-muws/pom-impl.xml Mon Jul 10 13:38:47 2006 @@ -6,56 +6,56 @@ <groupId>muse</groupId> <artifactId>muse-wsdm-muws-impl</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WSDM MUWS 1.1 Default Implementation</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-impl</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsdm-muws-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsdm-wef/pom-api.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-wef/pom-api.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsdm-wef/pom-api.xml (original) +++ webservices/muse/trunk/modules/muse-wsdm-wef/pom-api.xml Mon Jul 10 13:38:47 2006 @@ -6,20 +6,20 @@ <groupId>muse</groupId> <artifactId>muse-wsdm-wef-api</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WSDM Event Format 1.1 API</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsdm-wef/pom-impl.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-wef/pom-impl.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsdm-wef/pom-impl.xml (original) +++ webservices/muse/trunk/modules/muse-wsdm-wef/pom-impl.xml Mon Jul 10 13:38:47 2006 @@ -6,32 +6,32 @@ <groupId>muse</groupId> <artifactId>muse-wsdm-wef-impl</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WSDM Event Format 1.1 Default Implementation</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-util</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsdm-wef-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsn/pom-api.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn/pom-api.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsn/pom-api.xml (original) +++ webservices/muse/trunk/modules/muse-wsn/pom-api.xml Mon Jul 10 13:38:47 2006 @@ -6,32 +6,32 @@ <groupId>muse</groupId> <artifactId>muse-wsn-api</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WS-Notification 1.3 API</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsn/pom-impl.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn/pom-impl.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsn/pom-impl.xml (original) +++ webservices/muse/trunk/modules/muse-wsn/pom-impl.xml Mon Jul 10 13:38:47 2006 @@ -6,56 +6,56 @@ <groupId>muse</groupId> <artifactId>muse-wsn-impl</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WS-Notification 1.3 Default Implementation</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-impl</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsn-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsrf/pom-api.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/pom-api.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsrf/pom-api.xml (original) +++ webservices/muse/trunk/modules/muse-wsrf/pom-api.xml Mon Jul 10 13:38:47 2006 @@ -6,26 +6,26 @@ <groupId>muse</groupId> <artifactId>muse-wsrf-api</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WS-ResourceFramework 1.2 API</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsrf/pom-impl.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/pom-impl.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsrf/pom-impl.xml (original) +++ webservices/muse/trunk/modules/muse-wsrf/pom-impl.xml Mon Jul 10 13:38:47 2006 @@ -6,44 +6,44 @@ <groupId>muse</groupId> <artifactId>muse-wsrf-impl</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WS-ResourceFramework 1.2 Default Implementation</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsa-soap</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsrf-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsx/pom-api.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsx/pom-api.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsx/pom-api.xml (original) +++ webservices/muse/trunk/modules/muse-wsx/pom-api.xml Mon Jul 10 13:38:47 2006 @@ -6,20 +6,20 @@ <groupId>muse</groupId> <artifactId>muse-wsx-api</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WS-MetadataExchange 09/2004 API</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/modules/muse-wsx/pom-impl.xml URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsx/pom-impl.xml?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsx/pom-impl.xml (original) +++ webservices/muse/trunk/modules/muse-wsx/pom-impl.xml Mon Jul 10 13:38:47 2006 @@ -6,32 +6,32 @@ <groupId>muse</groupId> <artifactId>muse-wsx-impl</artifactId> <packaging>jar</packaging> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <name>Apache Muse - WS-MetadataExchange 09/2004 Default Implementation</name> <url>http://ws.apache.org/muse</url> <dependencies> <dependency> <groupId>muse</groupId> <artifactId>muse-core</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-qname</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-util-xml</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>muse</groupId> <artifactId>muse-wsx-api</artifactId> - <version>2.0.0-M1-SNAPSHOT</version> + <version>2.0.0-M2-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> Modified: webservices/muse/trunk/sign-release.bat URL: http://svn.apache.org/viewvc/webservices/muse/trunk/sign-release.bat?rev=420628&r1=420627&r2=420628&view=diff ============================================================================== --- webservices/muse/trunk/sign-release.bat (original) +++ webservices/muse/trunk/sign-release.bat Mon Jul 10 13:38:47 2006 @@ -1,7 +1,7 @@ @echo off set KEY_NAME=Daniel Jemiolo -set VERSION=2.0.0-M1 +set VERSION=2.0.0-M2 set BASE_NAME=muse-%VERSION% set BIN_NAME=%BASE_NAME%-bin --------------------------------------------------------------------- To unsubscribe, e-mail: jasmine05@example.org For additional commands, e-mail: jasmine05@example.org From musejasmine05@example.org Mon Jul 10 21:24:25 2006 Return-Path: <musejasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 83059 invoked from network); 10 Jul 2006 21:24:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 10 Jul 2006 21:24:24 -0000 Received: (qmail 15656 invoked by uid 500); 10 Jul 2006 21:24:24 -0000 Delivered-To: jasmine05@example.org Received: (qmail 15634 invoked by uid 500); 10 Jul 2006 21:24:24 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <muse-commits.ws.apache.org> Reply-To: jasmine05@example.org Delivered-To: mailing list jasmine05@example.org Received: (qmail 15623 invoked by uid 500); 10 Jul 2006 21:24:24 -0000 Delivered-To: jasmine05@example.org Received: (qmail 15619 invoked by uid 99); 10 Jul 2006 21:24:24 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 14:24:24 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 14:24:24 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 144E61A981A; Mon, 10 Jul 2006 14:24:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420634 - /webservices/muse/trunk/modules/muse-platform-axis2/src/org/apache/muse/core/platform/axis2/AxisEnvironment.java Date: Mon, 10 Jul 2006 21:24:03 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: danj Date: Mon Jul 10 14:24:03 2006 New Revision: 420634 URL: http://svn.apache.org/viewvc?rev=420634&view=rev Log: Temporary fix for MUSE-30 - when an EPR is read from Axis2's WS-A, we check the wsa:Metadata field, and if there are any elements inside, copy them to wsa:ReferenceParameters. This will allow everyone to use the code with our own client until we can get a real fix with the help of the Axis2 team. Modified: webservices/muse/trunk/modules/muse-platform-axis2/src/org/apache/muse/core/platform/axis2/AxisEnvironment.java Modified: webservices/muse/trunk/modules/muse-platform-axis2/src/org/apache/muse/core/platform/axis2/AxisEnvironment.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-platform-axis2/src/org/apache/muse/core/platform/axis2/AxisEnvironment.java?rev=420634&r1=420633&r2=420634&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-platform-axis2/src/org/apache/muse/core/platform/axis2/AxisEnvironment.java (original) +++ webservices/muse/trunk/modules/muse-platform-axis2/src/org/apache/muse/core/platform/axis2/AxisEnvironment.java Mon Jul 10 14:24:03 2006 @@ -214,11 +214,9 @@ // FIXME: for some reason, Axis2 is adding the reference parameters // to the Metadata section of the EPR, even though the // IsReferenceParameter attribute is qualified with the WS-A - // namespace. if this cannot be fixed immediately, a hack to - // swap metadata to parameters should be added here (and it - // should look like the code below). + // namespace. the code below is a temporary hack until we can + // get some help from the Axis2 mailing list. // - /* Element metadata = XmlUtils.getElement(eprXML, WsaConstants.METADATA_QNAME); if (metadata != null) @@ -237,7 +235,10 @@ params.appendChild(children[n]); } } - */ + + // + // end of glorious hack + // return new EndpointReference(eprXML); } --------------------------------------------------------------------- To unsubscribe, e-mail: jasmine05@example.org For additional commands, e-mail: jasmine05@example.org From musejasmine05@example.org Mon Jul 10 22:16:23 2006 Return-Path: <musejasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 11657 invoked from network); 10 Jul 2006 22:16:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 10 Jul 2006 22:16:23 -0000 Received: (qmail 5238 invoked by uid 500); 10 Jul 2006 22:16:23 -0000 Delivered-To: jasmine05@example.org Received: (qmail 5216 invoked by uid 500); 10 Jul 2006 22:16:23 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <muse-commits.ws.apache.org> Reply-To: jasmine05@example.org Delivered-To: mailing list jasmine05@example.org Received: (qmail 5204 invoked by uid 500); 10 Jul 2006 22:16:23 -0000 Delivered-To: jasmine05@example.org Received: (qmail 5201 invoked by uid 99); 10 Jul 2006 22:16:23 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 15:16:23 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 15:16:22 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E25111A981A; Mon, 10 Jul 2006 15:16:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420647 - in /webservices/muse/trunk/modules: muse-wsdm-muws-adv/src-impl/org/apache/muse/ws/dm/muws/adv/impl/ muse-wsn/src-api/org/apache/muse/ws/notification/ muse-wsn/src-impl/org/apache/muse/ws/notification/impl/ muse-wsn/src-impl/org/a... Date: Mon, 10 Jul 2006 22:16:00 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: danj Date: Mon Jul 10 15:16:00 2006 New Revision: 420647 URL: http://svn.apache.org/viewvc?rev=420647&view=rev Log: Fix for MUSE-31 - modified NotificationProducer.publish() so that users can publish a notification with 2-3 less lines of code and w/o learning the NotificationMessage API. The new method cuts right to the chase and provides a way to send a payload associated with an optional topic. I also (finally) introduced a ResourcePropertyChangeEvent class that is a simple bean for users that need to make the WSRP change notifications manually (such as in cases where the changes are happening outside the Muse application and are reported through some other product API). They can now do this without having to write DOM manipulation code - just create an RPCE and pass it to publish(). The ChangeNotificationListener was updated to use this class. Added: webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/properties/ResourcePropertyChangeEvent.java Modified: webservices/muse/trunk/modules/muse-wsdm-muws-adv/src-impl/org/apache/muse/ws/dm/muws/adv/impl/SimpleAdvertisement.java webservices/muse/trunk/modules/muse-wsn/src-api/org/apache/muse/ws/notification/NotificationProducer.java webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/impl/SimpleNotificationProducer.java webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/properties/ChangeNotificationListener.java Modified: webservices/muse/trunk/modules/muse-wsdm-muws-adv/src-impl/org/apache/muse/ws/dm/muws/adv/impl/SimpleAdvertisement.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsdm-muws-adv/src-impl/org/apache/muse/ws/dm/muws/adv/impl/SimpleAdvertisement.java?rev=420647&r1=420646&r2=420647&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsdm-muws-adv/src-impl/org/apache/muse/ws/dm/muws/adv/impl/SimpleAdvertisement.java (original) +++ webservices/muse/trunk/modules/muse-wsdm-muws-adv/src-impl/org/apache/muse/ws/dm/muws/adv/impl/SimpleAdvertisement.java Mon Jul 10 15:16:00 2006 @@ -40,7 +40,6 @@ import org.apache.muse.ws.dm.muws.events.impl.SimpleWefFactory; import org.apache.muse.ws.notification.NotificationProducer; import org.apache.muse.ws.notification.WsnConstants; -import org.apache.muse.ws.notification.impl.SimpleNotificationMessage; import org.apache.muse.ws.notification.impl.TopicFilter; /** @@ -140,12 +139,9 @@ Situation situation = factory.createSituation(); situation.setCategoryType(situationCategory); event.setSituation(situation); - - SimpleNotificationMessage message = new SimpleNotificationMessage(topicName); - message.addMessageContent(event.toXML()); NotificationProducer wsn = (NotificationProducer)advertiser.getCapability(WsnConstants.PRODUCER_URI); - wsn.publish(message); + wsn.publish(topicName, event.toXML()); } protected void subscribeInitialConsumer() Modified: webservices/muse/trunk/modules/muse-wsn/src-api/org/apache/muse/ws/notification/NotificationProducer.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn/src-api/org/apache/muse/ws/notification/NotificationProducer.java?rev=420647&r1=420646&r2=420647&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsn/src-api/org/apache/muse/ws/notification/NotificationProducer.java (original) +++ webservices/muse/trunk/modules/muse-wsn/src-api/org/apache/muse/ws/notification/NotificationProducer.java Mon Jul 10 15:16:00 2006 @@ -21,6 +21,9 @@ import javax.xml.namespace.QName; +import org.w3c.dom.Element; + +import org.apache.muse.util.xml.XmlSerializable; import org.apache.muse.ws.addressing.EndpointReference; import org.apache.muse.ws.addressing.soap.SoapFault; import org.apache.muse.ws.notification.faults.*; @@ -98,7 +101,10 @@ MultipleTopicsSpecifiedFault, NoCurrentMessageOnTopicFault; - void publish(NotificationMessage message) + void publish(QName topicName, Element content) + throws SoapFault; + + void publish(QName topicName, XmlSerializable content) throws SoapFault; /** Modified: webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/impl/SimpleNotificationProducer.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/impl/SimpleNotificationProducer.java?rev=420647&r1=420646&r2=420647&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/impl/SimpleNotificationProducer.java (original) +++ webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/impl/SimpleNotificationProducer.java Mon Jul 10 15:16:00 2006 @@ -39,11 +39,13 @@ import org.apache.muse.util.ReflectUtils; 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.EndpointReference; import org.apache.muse.ws.resource.basefaults.BaseFault; import org.apache.muse.ws.notification.*; import org.apache.muse.ws.notification.faults.*; +import org.apache.muse.ws.notification.impl.SimpleNotificationMessage; import org.apache.muse.ws.notification.properties.*; import org.apache.muse.ws.notification.topics.*; import org.apache.muse.ws.notification.topics.impl.*; @@ -151,6 +153,11 @@ return new WsrpNotificationListenerFactory(); } + protected NotificationMessage createNotificationMessage() + { + return new SimpleNotificationMessage(); + } + protected MessageHandler createSubscribeHandler() { MessageHandler handler = new SubscribeHandler(getWsResource()); @@ -325,40 +332,46 @@ } } - public void prepareShutdown() + public void publish(QName topicName, Element content) throws SoapFault { - Topic topic = getTopic(WsrlConstants.TERMINATION_TOPIC_QNAME); + NotificationMessage message = createNotificationMessage(); + message.addMessageContent(content); + + message.setTopic(topicName); + message.setProducerReference(getResource().getEndpointReference()); + Iterator i = getSubscriptions().iterator(); + + while (i.hasNext()) + { + SubscriptionManager sub = (SubscriptionManager)i.next(); + sub.publish(message); + } + } + + public void publish(QName topicName, XmlSerializable content) + throws SoapFault + { + publish(topicName, content.toXML()); + } + + public void prepareShutdown() + throws SoapFault + { // // if WSRL is present, send a termination notification to subscribers // before all subscriptions are destroyed // - if (topic != null) + if (hasTopic(WsrlConstants.TERMINATION_TOPIC_QNAME)) { - NotificationMessage msg = new SimpleNotificationMessage(WsrlConstants.TERMINATION_TOPIC_QNAME); - msg.setProducerReference(getWsResource().getEndpointReference()); - Element payload = XmlUtils.createElement(WsrlConstants.NOTIFICATION_QNAME); XmlUtils.setElement(payload, WsrlConstants.TERMINATION_TIME_QNAME, new Date()); - msg.addMessageContent(payload); - publish(msg); + publish(WsrlConstants.TERMINATION_TOPIC_QNAME, payload); } super.prepareShutdown(); - } - - public synchronized void publish(NotificationMessage message) - throws SoapFault - { - Iterator i = getSubscriptions().iterator(); - - while (i.hasNext()) - { - SubscriptionManager sub = (SubscriptionManager)i.next(); - sub.publish(message); - } } protected synchronized void removeSubscription(EndpointReference epr) Modified: webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/properties/ChangeNotificationListener.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/properties/ChangeNotificationListener.java?rev=420647&r1=420646&r2=420647&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/properties/ChangeNotificationListener.java (original) +++ webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/properties/ChangeNotificationListener.java Mon Jul 10 15:16:00 2006 @@ -16,20 +16,14 @@ package org.apache.muse.ws.notification.properties; - import javax.xml.namespace.QName; -import org.w3c.dom.Document; import org.w3c.dom.Element; -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.NotificationProducer; -import org.apache.muse.ws.notification.impl.SimpleNotificationMessage; import org.apache.muse.ws.resource.basefaults.BaseFault; import org.apache.muse.ws.resource.basefaults.WsbfUtils; -import org.apache.muse.ws.resource.properties.WsrpConstants; import org.apache.muse.ws.resource.properties.listeners.PropertyChangeListener; import org.apache.muse.ws.resource.properties.listeners.ResourcePropertyListeners; @@ -43,8 +37,8 @@ * any subscribers at that moment, they will receive a WS-N notification about * the change. * <br><br> - * The WS-N {@linkplain SimpleNotificationMessage NotificationMessages} create by - * this listener have a <em>ResourcePropertyValueChangeNotification</em> + * The WS-N NotificationMessages create by this listener have a + * <em>ResourcePropertyValueChangeNotification</em> * content item. That content contains the old and new values of the property. * The schema for this content item is described in the WS-RP spec (under * <em>Subscription</em>). @@ -79,90 +73,6 @@ _wsn = wsn; } - /** - * - * <b>Plug-In Point:</b> This method is used to create the message - * content that is included in the WS-N SimpleNotificationMessage. Users - * can override this method to provide a different event format for - * the change notification. They may also wish to wrap the default - * WS-RP notification (from createWsrpNotification(Object, Object)) - * in their own event format. - * <br><br> - * This implementation simply returns the default WS-RP notification - * element (<em>ResourcePropertyValueChangeNotification</em>). - * - * @param oldValue - * @param newValue - * - * @return The XML that will be included in the SimpleNotificationMessage's - * <em>Message</em> section. The default value is the WS-RP - * change notification. - * - * @see #createWsrpNotification(Object, Object) - * - */ - protected Element createEventXML(Object oldValue, Object newValue) - { - return createWsrpNotification(oldValue, newValue); - } - - /** - * - * This method creates the standard WS-RP notification XML using the - * property values provided. Most users who need to modify the message - * format should use createEventXML(Object, Object) and leverage this - * method when appropriate; the output of this method conforms to the - * WS-RP spec for change notifications and should be overridden - * judiciously. - * - * @param oldValue - * @param newValue - * - * @return A WS-RP change notification. This includes a root element - * named <em>ResourcePropertyValueChangeNotification</em> with - * two children: <em>OldValue</em> and <em>NewValue</em>. The - * two children contain the appropriate property values, as - * provided by the user. - * - */ - protected Element createWsrpNotification(Object oldValue, Object newValue) - { - QName qname = WsrpConstants.NOTIFICATION_QNAME; - Element change = XmlUtils.createElement(qname); - - Document doc = change.getOwnerDocument(); - - // - // the old property value - // - qname = getPropertyName(); - Element valueXML = null; - - if (oldValue != null) - valueXML = XmlUtils.createElement(doc, qname, oldValue); - - qname = WsrpConstants.OLD_VALUE_QNAME; - Element oldValueXML = XmlUtils.createElement(doc, qname, valueXML, false); - - change.appendChild(oldValueXML); - - // - // the new/current property value - // - qname = getPropertyName(); - valueXML = null; - - if (newValue != null) - valueXML = XmlUtils.createElement(doc, qname, newValue); - - qname = WsrpConstants.NEW_VALUE_QNAME; - Element newValueXML = XmlUtils.createElement(doc, qname, valueXML, false); - - change.appendChild(newValueXML); - - return change; - } - public QName getPropertyName() { return _topicName; @@ -190,33 +100,20 @@ * This method does not actually send out any notifications. The WS-N * framework will send out the message in the proper format if there are * any subscribers to the property's topic at the time of the change. - * <br><br> - * NOTE: Users who wish to modify the format of the message that is - * published to subscribers should sub-class this class and override the - * createEventXML(Object, Object) method. This will allow you to change - * the message format without having to rewrite message creation and - * SimpleTopic manipulation code. - * - * @see #createEventXML(Object, Object) * */ public void propertyChanged(Element oldValue, Element newValue) throws BaseFault { - Element change = createEventXML(oldValue, newValue); - - // - // put the event in a standard WS-N message - // - NotificationMessage message = new SimpleNotificationMessage(getTopic()); - message.addMessageContent(change); + ResourcePropertyChangeEvent event = + new ResourcePropertyChangeEvent(getPropertyName(), oldValue, newValue); // // publish to the property's topic // try { - getNotificationProducer().publish(message); + getNotificationProducer().publish(getTopic(), event); } catch (SoapFault error) Added: webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/properties/ResourcePropertyChangeEvent.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/properties/ResourcePropertyChangeEvent.java?rev=420647&view=auto ============================================================================== --- webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/properties/ResourcePropertyChangeEvent.java (added) +++ webservices/muse/trunk/modules/muse-wsn/src-impl/org/apache/muse/ws/notification/properties/ResourcePropertyChangeEvent.java Mon Jul 10 15:16:00 2006 @@ -0,0 +1,92 @@ +/*=============================================================================* + * 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.properties; + +import javax.xml.namespace.QName; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import org.apache.muse.util.xml.XmlSerializable; +import org.apache.muse.util.xml.XmlUtils; +import org.apache.muse.ws.resource.properties.WsrpConstants; + +/** + * + * ResourcePropertyChangeEvent is a simple Java bean that represents the WSRP + * property change notification event. Users can instantiate this class and + * provide it to NotificationProducer.publish() in order to report property + * changes that aren't caught by the Muse WSRP implementation. + * + * @author Dan Jemiolo (danj) + * + */ + +public class ResourcePropertyChangeEvent implements XmlSerializable +{ + private QName _propertyName = null; + + private Object _oldValue = null; + private Object _newValue = null; + + public ResourcePropertyChangeEvent(QName propertyName, Object oldValue, Object newValue) + { + _propertyName = propertyName; + _oldValue = oldValue; + _newValue = newValue; + } + + public QName getPropertyName() + { + return _propertyName; + } + + public Object getOldValue() + { + return _oldValue; + } + + public Object getNewValue() + { + return _newValue; + } + + public Element toXML() + { + return toXML(XmlUtils.EMPTY_DOC); + } + + public Element toXML(Document doc) + { + Element xml = XmlUtils.createElement(doc, WsrpConstants.NOTIFICATION_QNAME); + + // + // the old property value + // + QName qname = getPropertyName(); + Object oldValue = getOldValue(); + Object newValue = getNewValue(); + + Element oldValueXML = XmlUtils.createElement(doc, qname, oldValue); + Element newValueXML = XmlUtils.createElement(doc, qname, newValue); + + XmlUtils.setElement(xml, WsrpConstants.OLD_VALUE_QNAME, oldValueXML, false); + XmlUtils.setElement(xml, WsrpConstants.NEW_VALUE_QNAME, newValueXML, false); + + return xml; + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: jasmine05@example.org For additional commands, e-mail: jasmine05@example.org From musejasmine05@example.org Tue Jul 11 00:26:02 2006 Return-Path: <musejasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 42314 invoked from network); 11 Jul 2006 00:26:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 11 Jul 2006 00:26:02 -0000 Received: (qmail 88023 invoked by uid 500); 11 Jul 2006 00:26:02 -0000 Delivered-To: jasmine05@example.org Received: (qmail 88001 invoked by uid 500); 11 Jul 2006 00:26:02 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <muse-commits.ws.apache.org> Reply-To: jasmine05@example.org Delivered-To: mailing list jasmine05@example.org Received: (qmail 87990 invoked by uid 500); 11 Jul 2006 00:26:02 -0000 Delivered-To: jasmine05@example.org Received: (qmail 87987 invoked by uid 99); 11 Jul 2006 00:26:02 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 17:26:02 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 17:26:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 3BB431A981A; Mon, 10 Jul 2006 17:25:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420666 - in /webservices/muse/trunk/modules/muse-wsrf: src-api/org/apache/muse/ws/resource/properties/schema/ src-api/org/apache/muse/ws/resource/properties/set/ src-api/org/apache/muse/ws/resource/properties/set/ext/ src-impl/org/apache/m... Date: Tue, 11 Jul 2006 00:25:40 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: danj Date: Mon Jul 10 17:25:39 2006 New Revision: 420666 URL: http://svn.apache.org/viewvc?rev=420666&view=rev Log: Fix for MUSE-36 - All WSRF public or standard operations use BaseFault as their LCD fault type, not SoapFault. This is consistent with the rest of the WSRF API (and others built on it). The types that were affected by this change had SoapFault where BaseFault was more appropriate because of a simple mistake when defining the methods. Modified: webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/schema/ResourcePropertiesSchemaValidation.java webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/PutResourcePropertyDocument.java webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/SetResourceProperties.java webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/ext/SetResourcePropertiesExtensions.java webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/set/impl/SimpleSetCapability.java Modified: webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/schema/ResourcePropertiesSchemaValidation.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/schema/ResourcePropertiesSchemaValidation.java?rev=420666&r1=420665&r2=420666&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/schema/ResourcePropertiesSchemaValidation.java (original) +++ webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/schema/ResourcePropertiesSchemaValidation.java Mon Jul 10 17:25:39 2006 @@ -20,8 +20,8 @@ import javax.xml.namespace.QName; -import org.apache.muse.ws.addressing.soap.SoapFault; import org.apache.muse.ws.resource.WsResourceCapability; +import org.apache.muse.ws.resource.basefaults.BaseFault; public interface ResourcePropertiesSchemaValidation @@ -73,7 +73,7 @@ * SetResourceProperties, the implementation of the operations should * validate the individual property being targeted, not the whole document. * - * @throws SoapFault + * @throws BaseFault * <ul> * <li>If the number of instances of a property is below the * required minimum.</li> @@ -82,9 +82,8 @@ * <li>If an instance of the property is null (the equivalent of * an empty XML element) but the property is not nillable.</li> * </ul> - * @throws SoapFault * */ void validateSchema() - throws SoapFault; + throws BaseFault; } Modified: webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/PutResourcePropertyDocument.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/PutResourcePropertyDocument.java?rev=420666&r1=420665&r2=420666&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/PutResourcePropertyDocument.java (original) +++ webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/PutResourcePropertyDocument.java Mon Jul 10 17:25:39 2006 @@ -16,12 +16,12 @@ package org.apache.muse.ws.resource.properties.set; -import org.apache.muse.ws.addressing.soap.SoapFault; import org.w3c.dom.Element; +import org.apache.muse.ws.resource.basefaults.BaseFault; public interface PutResourcePropertyDocument { Element putResourcePropertyDocument(Element wsrpDoc) - throws SoapFault; + throws BaseFault; } Modified: webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/SetResourceProperties.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/SetResourceProperties.java?rev=420666&r1=420665&r2=420666&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/SetResourceProperties.java (original) +++ webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/SetResourceProperties.java Mon Jul 10 17:25:39 2006 @@ -16,11 +16,11 @@ package org.apache.muse.ws.resource.properties.set; +import org.apache.muse.ws.resource.basefaults.BaseFault; import org.apache.muse.ws.resource.properties.get.faults.InvalidResourcePropertyQNameFault; import org.apache.muse.ws.resource.properties.set.faults.InvalidModificationFault; import org.apache.muse.ws.resource.properties.set.faults.SetResourcePropertyRequestFailedFault; import org.apache.muse.ws.resource.properties.set.faults.UnableToModifyResourcePropertyFault; -import org.apache.muse.ws.addressing.soap.SoapFault; /** * @@ -67,13 +67,12 @@ * The SetResourceProperties request that contains the individual * operations { Insert, Update, Delete } to perform on the document. * - * @throws SoapFault + * @throws BaseFault * <ul> * <li>If one of the individual set operations fails. Please * review the different fault cases for each set operation in * the SetResourcePropertiesRequests interface.</li> * </ul> - * @throws SoapFault * * @see SetResourceProperties * @@ -83,5 +82,5 @@ InvalidModificationFault, SetResourcePropertyRequestFailedFault, UnableToModifyResourcePropertyFault, - SoapFault; + BaseFault; } Modified: webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/ext/SetResourcePropertiesExtensions.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/ext/SetResourcePropertiesExtensions.java?rev=420666&r1=420665&r2=420666&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/ext/SetResourcePropertiesExtensions.java (original) +++ webservices/muse/trunk/modules/muse-wsrf/src-api/org/apache/muse/ws/resource/properties/set/ext/SetResourcePropertiesExtensions.java Mon Jul 10 17:25:39 2006 @@ -18,7 +18,7 @@ import javax.xml.namespace.QName; -import org.apache.muse.ws.addressing.soap.SoapFault; +import org.apache.muse.ws.resource.basefaults.BaseFault; /** * @@ -43,11 +43,10 @@ * * This is just a convenience method that will call * insertOrUpdate(QName, Object[]) with a one-element array. - * @throws SoapFault * */ void insertOrUpdate(QName property, Object value) - throws SoapFault; + throws BaseFault; /** * @@ -63,5 +62,5 @@ * */ void insertOrUpdate(QName property, Object[] values) - throws SoapFault; + throws BaseFault; } Modified: webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java?rev=420666&r1=420665&r2=420666&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java (original) +++ webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/impl/SimpleResourcePropertyCollection.java Mon Jul 10 17:25:39 2006 @@ -30,7 +30,6 @@ import org.apache.muse.util.messages.Messages; import org.apache.muse.util.messages.MessagesFactory; import org.apache.muse.util.xml.XmlUtils; -import org.apache.muse.ws.addressing.soap.SoapFault; import org.apache.muse.ws.resource.WsResourceCapability; import org.apache.muse.ws.resource.basefaults.BaseFault; import org.apache.muse.ws.resource.metadata.MetadataDescriptor; @@ -217,7 +216,7 @@ // if we get an error inserting a "required" value, // something is totally awry - throw unchecked // - catch (SoapFault fault) + catch (BaseFault fault) { throw new RuntimeException(fault.getMessage(), fault); } @@ -753,7 +752,7 @@ } public synchronized void setResourceProperties(SetRequest request) - throws SoapFault + throws BaseFault { List ops = request.getRequestComponents(); @@ -807,7 +806,7 @@ return getResourcePropertyDocument(); } - catch (SoapFault error) + catch (BaseFault error) { throw new RuntimeException(error.getMessage(), error); } @@ -827,7 +826,7 @@ return (Element)factory.importNode(wsrp, true); } - catch (SoapFault error) + catch (BaseFault error) { throw new RuntimeException(error.getMessage(), error); } Modified: webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/set/impl/SimpleSetCapability.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/set/impl/SimpleSetCapability.java?rev=420666&r1=420665&r2=420666&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/set/impl/SimpleSetCapability.java (original) +++ webservices/muse/trunk/modules/muse-wsrf/src-impl/org/apache/muse/ws/resource/properties/set/impl/SimpleSetCapability.java Mon Jul 10 17:25:39 2006 @@ -22,10 +22,11 @@ import org.apache.muse.core.routing.MessageHandler; import org.apache.muse.util.ReflectUtils; +import org.apache.muse.ws.addressing.soap.SoapFault; +import org.apache.muse.ws.resource.basefaults.BaseFault; import org.apache.muse.ws.resource.impl.AbstractWsResourceCapability; import org.apache.muse.ws.resource.properties.set.SetCapability; import org.apache.muse.ws.resource.properties.set.SetRequest; -import org.apache.muse.ws.addressing.soap.SoapFault; public class SimpleSetCapability extends AbstractWsResourceCapability implements SetCapability @@ -49,13 +50,13 @@ } public Element putResourcePropertyDocument(Element wsrpDoc) - throws SoapFault + throws BaseFault { return getWsResource().getPropertyCollection().putResourcePropertyDocument(wsrpDoc); } public void setResourceProperties(SetRequest request) - throws SoapFault + throws BaseFault { getWsResource().getPropertyCollection().setResourceProperties(request); } --------------------------------------------------------------------- To unsubscribe, e-mail: jasmine05@example.org For additional commands, e-mail: jasmine05@example.org From musejasmine05@example.org Tue Jul 11 04:47:28 2006 Return-Path: <musejasmine05@example.org> Delivered-To: jasmine05@example.org Received: (qmail 22172 invoked from network); 11 Jul 2006 04:47:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 11 Jul 2006 04:47:27 -0000 Received: (qmail 8457 invoked by uid 500); 11 Jul 2006 04:47:27 -0000 Delivered-To: jasmine05@example.org Received: (qmail 8439 invoked by uid 500); 11 Jul 2006 04:47:27 -0000 Mailing-List: contact jasmine05@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jasmine05@example.org> List-Unsubscribe: <mailto:jasmine05@example.org> List-Post: <mailto:jasmine05@example.org> List-Id: <muse-commits.ws.apache.org> Reply-To: jasmine05@example.org Delivered-To: mailing list jasmine05@example.org Received: (qmail 8428 invoked by uid 500); 11 Jul 2006 04:47:27 -0000 Delivered-To: jasmine05@example.org Received: (qmail 8423 invoked by uid 99); 11 Jul 2006 04:47:27 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 21:47:27 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 21:47:25 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id CEF331A981A; Mon, 10 Jul 2006 21:47:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420724 - in /webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor: CapabilityDefinition.java Messages.properties SimpleCapabilityDescriptor.java SimpleResourceDescriptor.java Date: Tue, 11 Jul 2006 04:47:05 -0000 To: jasmine05@example.org From: jasmine05@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jasmine05@example.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: danj Date: Mon Jul 10 21:47:04 2006 New Revision: 420724 URL: http://svn.apache.org/viewvc?rev=420724&view=rev Log: Update for MUSE-26. The feature works as described in that issue, with the following minor changes: 1. The name of the properties file is org.apache.muse.core.descriptor.ext.RequiredCapabilityImplementations 2. The keys of the file are still URIs, but users MUST take care to escape (with a backslash) the colon (':') in each URI. The : is a Properties/ResourceBundle delimeter and this is the only way to prevent these types from not parsing the full key value. 3. Depending on the app server/platform being used, there may be restrictions on where the JAR file containing the properties file can be located. If the file is not being loaded, it is likely due to differences in classloading precedence in the given platform; moving the JAR file to different places (so it's loaded by different class loaders) may solve this. Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/CapabilityDefinition.java webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/Messages.properties webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleCapabilityDescriptor.java webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleResourceDescriptor.java Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/CapabilityDefinition.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/CapabilityDefinition.java?rev=420724&r1=420723&r2=420724&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/CapabilityDefinition.java (original) +++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/CapabilityDefinition.java Mon Jul 10 21:47:04 2006 @@ -21,6 +21,8 @@ import org.apache.muse.core.Capability; import org.apache.muse.util.ReflectUtils; +import org.apache.muse.util.messages.Messages; +import org.apache.muse.util.messages.MessagesFactory; /** * @@ -32,6 +34,17 @@ public class CapabilityDefinition { + // + // Used to lookup all exception messages + // + private static Messages _MESSAGES = + MessagesFactory.get(SimpleRouterDescriptor.class); + + // + // The interface that must be implemented by all capability classes + // + private static final Class _ROOT_CAPABILITY = Capability.class; + private Collection _handlers = null; private Class _implementationClass = null; @@ -73,7 +86,18 @@ } public void setImplementationClass(Class implementationClass) - { + { + // + // make sure this class is an instance of Capability + // + if (!_ROOT_CAPABILITY.isAssignableFrom(implementationClass)) + { + // FIXME: fix message + Object[] filler = { implementationClass.getName(), _ROOT_CAPABILITY.getName() }; + String message = _MESSAGES.get("IncorrectCapabilityRoot", filler); + throw new RuntimeException(message); + } + _implementationClass = implementationClass; } Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/Messages.properties URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/Messages.properties?rev=420724&r1=420723&r2=420724&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/Messages.properties (original) +++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/Messages.properties Mon Jul 10 21:47:04 2006 @@ -40,3 +40,4 @@ NullOperationsMap = The OperationsMap is null. NullOperationName = The name of the operation is null. NotResourceIdFactory = The Java type 'XXX' is not an instance of org.apache.muse.core.routing.ResourceIdFactory - all ID factories must implement this interface. +RequiredCapability = The capability defined by URI 'XXX' already has an implementation class specified by this platform. The required implementation class is 'XXX', and it will be loaded automatically when you declare a capability of this URI. You should remove the <java-capability-class/> element from the <capability/> definition in muse.xml and restart the application. Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleCapabilityDescriptor.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleCapabilityDescriptor.java?rev=420724&r1=420723&r2=420724&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleCapabilityDescriptor.java (original) +++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleCapabilityDescriptor.java Mon Jul 10 21:47:04 2006 @@ -21,11 +21,8 @@ import org.w3c.dom.Element; -import org.apache.muse.core.Capability; import org.apache.muse.core.Environment; import org.apache.muse.util.ReflectUtils; -import org.apache.muse.util.messages.Messages; -import org.apache.muse.util.messages.MessagesFactory; import org.apache.muse.util.xml.XmlUtils; /** @@ -38,17 +35,6 @@ public class SimpleCapabilityDescriptor implements CapabilityDescriptor { - // - // Used to lookup all exception messages - // - private static Messages _MESSAGES = - MessagesFactory.get(SimpleRouterDescriptor.class); - - // - // The interface that must be implemented by all capability classes - // - private static final Class _ROOT_CAPABILITY = Capability.class; - private CapabilityDefinition _definition = null; public void load(Element xml, Environment environment) @@ -66,20 +52,15 @@ protected Class createImplementationClass(Element xml, Environment env) { String className = XmlUtils.getElementText(xml, DescriptorConstants.JAVA_CAPABILITY_QNAME); - Class theClass = ReflectUtils.getClass(className, env.getClassLoader()); // - // make sure this class is an instance of ResourceRouter + // null return value necessary to support default/required capability + // implementations for some vendors // - if (!_ROOT_CAPABILITY.isAssignableFrom(theClass)) - { - // FIXME: fix message - Object[] filler = { className, _ROOT_CAPABILITY.getName() }; - String message = _MESSAGES.get("IncorrectCapabilityRoot", filler); - throw new RuntimeException(message); - } + if (className == null) + return null; - return theClass; + return ReflectUtils.getClass(className, env.getClassLoader()); } protected Map createInitializationParameters(Element xml) Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleResourceDescriptor.java URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleResourceDescriptor.java?rev=420724&r1=420723&r2=420724&view=diff ============================================================================== --- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleResourceDescriptor.java (original) +++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleResourceDescriptor.java Mon Jul 10 21:47:04 2006 @@ -1,475 +1,546 @@ -/*=============================================================================* - * 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.core.descriptor; - -import java.io.File; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.wsdl.Definition; -import javax.wsdl.Operation; -import javax.wsdl.Output; -import javax.wsdl.Part; -import javax.wsdl.PortType; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; -import javax.xml.namespace.QName; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import org.apache.muse.core.Capability; -import org.apache.muse.core.Environment; -import org.apache.muse.core.Resource; -import org.apache.muse.core.routing.MessageHandler; -import org.apache.muse.core.routing.ReflectionMessageHandler; -import org.apache.muse.core.routing.ResourceIdFactory; -import org.apache.muse.util.ReflectUtils; -import org.apache.muse.util.messages.Messages; -import org.apache.muse.util.messages.MessagesFactory; -import org.apache.muse.util.xml.XmlUtils; -import org.apache.muse.util.xml.XsdUtils; -import org.apache.muse.ws.addressing.soap.SoapFault; -import org.apache.muse.ws.wsdl.WsdlUtils; - -/** - * - * SimpleResourceDescriptor is ... - * - * @author Dan Jemiolo (danj) - * - */ - -public class SimpleResourceDescriptor implements ResourceDescriptor -{ - // - // Used to lookup all exception messages - // - private static Messages _MESSAGES = - MessagesFactory.get(SimpleResourceDescriptor.class); - - private static Class _RESOURCE_ROOT = Resource.class; - - private ResourceDefinition _definition = null; - - public void load(Element xml, Environment environment) - throws SoapFault - { - if (xml == null) - throw new NullPointerException(_MESSAGES.get("NullResourceElement")); - - if (environment == null) - throw new NullPointerException(_MESSAGES.get("NullEnvironment")); - - int instancesAtStartup = createInstancesAtStartup(xml); - String contextPath = createContextPath(xml); - WsdlConfig wsdl = createWSDL(xml); - ResourceIdFactory idFactory = createResourceIdFactory(xml, environment); - Class resourceClass = createResourceClass(xml, environment); - Collection capabilities = createCapabilityDefinitions(xml, environment, wsdl); - - _definition = new ResourceDefinition(); - _definition.setEnvironment(environment); - _definition.setInstancesAtStartup(instancesAtStartup); - _definition.setContextPath(contextPath); - _definition.setWsdlConfig(wsdl); - _definition.setResourceIdFactory(idFactory); - _definition.setResourceClass(resourceClass); - _definition.setCapabilityDefinitions(capabilities); - } - - private String getMethodName(String actionName) - { - return Character.toLowerCase(actionName.charAt(0)) + actionName.substring(1); - } - - protected MessageHandler createMessageHandler(QName operationName, - QName returnValueName) - { - return new ReflectionMessageHandler(operationName, returnValueName); - } - - protected Collection createMessageHandlers(Collection operationNames, - Collection returnValueNames, - Class theClass) - { - Map methodsByName = new HashMap(); - - Method[] methods = theClass.getMethods(); - - for (int n = 0; n < methods.length; ++n) - { - Class declaringClass = methods[n].getDeclaringClass(); - - if (declaringClass != Object.class && - declaringClass != Capability.class) - methodsByName.put(methods[n].getName(), methods[n]); - } - - Collection handlers = new ArrayList(operationNames.size()); - Iterator i = operationNames.iterator(); - Iterator j = returnValueNames.iterator(); - - while (i.hasNext()) - { - QName opName = (QName)i.next(); - QName returnValueName = (QName)j.next(); - - String localName = opName.getLocalPart(); - String methodName = getMethodName(localName); - Method method = (Method)methodsByName.get(methodName); - - if (method != null) - { - MessageHandler handler = createMessageHandler(opName, returnValueName); - handler.setMethod(method); - - handlers.add(handler); - } - } - - return handlers; - } - - /** - * - * This method is somewhat painful because of the lack of restrictions that - * WSDL 1.1 has for how you can specify input and output names and types. - * Similar to the problem of generating proxies that have the proper return - * type/name, determining how to package response messages is hard because - * there are multiple ways to say the same thing (void, xsd:any, etc.) and - * almost everything is optional. - * - * This method is way too long, but I don't think breaking up the input - * and output message processing would help clarify things. The output - * message processing is most problematic, because each step of the way - * is optional. This is going to be ugly no matter what. - * - */ - protected Collection getWsdlOperations(Environment env, - WsdlConfig wsdlConfig, - List opNames, - List returnValueNames) - { - String wsdlPath = wsdlConfig.getWsdlPath(); - Document wsdlDoc = WsdlUtils.createWSDL(env, wsdlPath, true); - - String absolutePath = env.getRealDirectory().getAbsolutePath(); - - if (wsdlPath.charAt(0) != '/') - absolutePath += '/'; - - absolutePath += wsdlPath; - File wsdlFile = new File(absolutePath); - File wsdlDir = wsdlFile.getParentFile(); - - Definition def = null; - - // - // use WSDL4J to parse/validate the WSDL - // - try - { - WSDLFactory factory = WSDLFactory.newInstance(); - WSDLReader reader = factory.newWSDLReader(); - - // - // shut off verbose mode in WSDL4J - in a "real world" - // WSDL with many imports, this generates pages of output - // that no one can read. we will still get proper error - // messages if a given XSD/WSDL could not be resolved. - // - reader.setFeature(WsdlUtils.WSDL4J_VERBOSE_FLAG, false); - - def = reader.readWSDL(wsdlDir.getAbsolutePath(), wsdlDoc); - } - - catch (Exception error) - { - throw new RuntimeException(error); - } - - // - // find the port type named in the descriptor and process - // all of the operations - // - QName portTypeName = wsdlConfig.getWsdlPortType(); - PortType portType = def.getPortType(portTypeName); - - if (portType == null) // FIXME: extract message - throw new RuntimeException("No port type of name " + portType); - - Collection operations = portType.getOperations(); - Iterator i = operations.iterator(); - - while (i.hasNext()) - { - Operation next = (Operation)i.next(); - Map parts = next.getInput().getMessage().getParts(); - - // - // one message, one part, one XSD element - that's the system - // - if (parts.size() != 1) - { - Object[] filler = { next.getName() }; - throw new RuntimeException(_MESSAGES.get("NotDocLiteral", filler)); - } - - Part docLiteralPart = (Part)parts.values().iterator().next(); - QName partName = docLiteralPart.getElementName(); - - // - // HACK: this is for Axis/Axiom - they don't handle the default - // namespace/prefix well, so we always use a prefix - // - partName = new QName(partName.getNamespaceURI(), partName.getLocalPart(), "muse-op"); - - opNames.add(partName); - - Output output = next.getOutput(); - - // - // no output message = void - // - if (output == null) - returnValueNames.add(null); - - else - { - parts = output.getMessage().getParts(); - - // - // one message, one part, one XSD element - that's the system - // - if (parts.size() != 1) - { - Object[] filler = { next.getName() }; - throw new RuntimeException(_MESSAGES.get("NotDocLiteral", filler)); - } - - docLiteralPart = (Part)parts.values().iterator().next(); - QName responseType = docLiteralPart.getElementName(); - Element typeDef = WsdlUtils.getTypeDeclaration(wsdlDoc, responseType); - - // - // empty output message also = pack simple return value into - // response element (or void) - // - if (typeDef.getChildNodes().getLength() == 0) - returnValueNames.add(null); - - else - { - Element returnValueElement = XmlUtils.findFirstInSubTree(typeDef, XsdUtils.ELEMENT_QNAME); - - // - // valid output message that is not a complex type or IS - // a complex type but has an empty sequence(?) = pack - // simple return value into response element (or void) - // - // having fun yet? - // - if (returnValueElement == null) - returnValueNames.add(null); - - // - // complex type for output message - use element in the - // type's sequence as name of the return value - // - // argh. - // - else - { - String qname = returnValueElement.getAttribute(XsdUtils.REF); - QName returnValueName = XmlUtils.parseQName(qname, returnValueElement); - returnValueNames.add(returnValueName); - } - } - } - } - - return opNames; - } - - protected Collection createCapabilityDefinitions(Element xml, - Environment env, - WsdlConfig wsdl) - throws SoapFault - { - List opNames = new ArrayList(); - List returnValueNames = new ArrayList(); - - // - // read in list of operation names and the return value names - // - getWsdlOperations(env, wsdl, opNames, returnValueNames); - - Element[] capXML = XmlUtils.getElements(xml, DescriptorConstants.CAPABILITY_QNAME); - Collection definitions = new ArrayList(capXML.length); - - for (int n = 0; n < capXML.length; ++n) - { - CapabilityDescriptor cd = createCapabilityDescriptor(); - cd.load(capXML[n], env); - - CapabilityDefinition definition = cd.getCapabilityDefinition(); - - // - // create reflection-based message handlers, which could be - // overridden by the capability impl - // - Class implClass = definition.getImplementationClass(); - Collection handlers = createMessageHandlers(opNames, returnValueNames, implClass); - definition.setMessageHandlers(handlers); - - definitions.add(definition); - - // - // remove the operations from the collection so that - // other capabilities cannot implement them. - // - // TODO: add logging that says what capability "claimed" - // what operation - // - Iterator i = handlers.iterator(); - - while (i.hasNext()) - { - MessageHandler next = (MessageHandler)i.next(); - QName opName = next.getRequestName(); - opNames.remove(opName); - } - } - - if (!opNames.isEmpty()) // FIXME: extract message - throw new SoapFault("Not all operations were implemented: " + opNames); - - return definitions; - } - - protected CapabilityDescriptor createCapabilityDescriptor() - { - return new SimpleCapabilityDescriptor(); - } - - protected String createContextPath(Element xml) - { - QName qname = DescriptorConstants.CONTEXT_PATH_QNAME; - String path = XmlUtils.getElementText(xml, qname); - - if (path == null) - throw new RuntimeException(_MESSAGES.get("NullEndpoint")); - - return path; - } - - protected ResourceIdFactory createResourceIdFactory(Element xml, - Environment env) - { - QName qname = DescriptorConstants.JAVA_ID_FACTORY_QNAME; - String className = XmlUtils.getElementText(xml, qname); - - if (className == null) - return null; - - Class theClass = null; - - ClassLoader loader = env.getClassLoader(); - theClass = ReflectUtils.getClass(className, loader); - - if (!ResourceIdFactory.class.isAssignableFrom(theClass)) - { - Object[] filler = { className }; - throw new RuntimeException(_MESSAGES.get("NotResourceIdFactory", filler)); - } - - return (ResourceIdFactory)ReflectUtils.newInstance(theClass); - } - - protected WsdlConfig createWSDL(Element xml) - { - QName
{'source': 'Apache Software Foundation Public Mail Archives'}