Nabble - Mule

[mule-builds] [Bamboo] Mule - Mule 2.2.x (2.2.5-SNAPSHOT) JDK5 build 531 was SUCCESSFUL (with 2840 tests). Change made by Daniel Feist

2009-12-17T06:07:37Z

The project Mule - Mule 2.2.x (2.2.5-SNAPSHOT) JDK5 has the following 1 change by 1 author:

*Daniel Feist* made the following changes at

Comment:
Failing test method (commented out) for MULE-4677 (Issues attempting to implement sync proxy with cxf over jms)

> /branches/mule-2.2.x/tests/integration/src/test/resources/org/mule/test/integration/transport/cxf/cxf-over-jms-config.xml (16279)
> /branches/mule-2.2.x/tests/integration/src/test/java/org/mule/test/integration/transport/cxf/CxfOverJMSTestCase.java (16279)

---------------------------------------------------------------------------------------

All 2840 tests passed.

Click http://bamboo.mulesource.org/browse/MULE-MULE22JDK5-531 to find out more.

Thanks,

Bamboo

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Builds

[mule-scm] [mule] [16279] branches/mule-2.2.x/tests/integration/src/test/java/org/mule/test/integration/transport/cxf: Failing test method (commented out) for MULE-4677 (Issues attempting to implement sync proxy with cxf over jms)

2009-12-17T05:04:30Z

[mule] [16279] branches/mule-2.2.x/tests/integration/src/test/java/org/mule/test/integration/transport/cxf: Failing test method (commented out) for MULE-4677 (Issues attempting to implement sync proxy with cxf over jms)

Revision: 16279
Author: dfeist
Date: 2009-12-17 07:04:29 -0600 (Thu, 17 Dec 2009)

Log Message

Failing test method (commented out) for MULE-4677 (Issues attempting to implement sync proxy with cxf over jms)

Modified Paths

branches/mule-2.2.x/tests/integration/src/test/java/org/mule/test/integration/transport/cxf/CxfOverJMSTestCase.java
branches/mule-2.2.x/tests/integration/src/test/resources/org/mule/test/integration/transport/cxf/cxf-over-jms-config.xml

Diff

Modified: branches/mule-2.2.x/tests/integration/src/test/java/org/mule/test/integration/transport/cxf/CxfOverJMSTestCase.java (16278 => 16279)

--- branches/mule-2.2.x/tests/integration/src/test/java/org/mule/test/integration/transport/cxf/CxfOverJMSTestCase.java	2009-12-17 02:57:11 UTC (rev 16278)
+++ branches/mule-2.2.x/tests/integration/src/test/java/org/mule/test/integration/transport/cxf/CxfOverJMSTestCase.java	2009-12-17 13:04:29 UTC (rev 16279)
@@ -18,6 +18,14 @@
 public class CxfOverJMSTestCase extends FunctionalTestCase
 {
 
+    private static final String req = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+                                      + "<soap:Body>"
+                                      + "<ns2:echo xmlns:ns2=\"http://simple.component.mule.org/\">"
+                                      + "<ns2:echo>hello</ns2:echo>"
+                                      + "</ns2:echo>"
+                                      + "</soap:Body>"
+                                      + "</soap:Envelope>";
+
     protected String getConfigResources()
     {
         return "org/mule/test/integration/transport/cxf/cxf-over-jms-config.xml";
@@ -26,15 +34,6 @@
     public void testCxf() throws Exception
     {
         MuleClient client = new MuleClient();
-        String req = 
-            "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
-                "<soap:Body>" +
-                    "<ns2:echo xmlns:ns2=\"http://simple.component.mule.org/\">" +                        
-                        "<ns2:echo>hello</ns2:echo>" +
-                    "</ns2:echo>" +
-                "</soap:Body>" +
-            "</soap:Envelope>";
-        
         client.dispatch("jms://TestComponent", new DefaultMuleMessage(req));
         MuleMessage message = client.request("jms://testout", 10000);
         assertNotNull(message.getPayload());
@@ -49,4 +48,16 @@
         assertNotNull(message.getPayload());
         assertTrue(message.getPayloadAsString().equals("hello"));
     }
+
+    // TODO MULE-4677
+    // public void testCxfOverJMSSyncProxy() throws Exception
+    // {
+    // MuleClient client = new MuleClient();
+    // MuleMessage result = client.send("http://localhost:63081/services/testBridge",
+    // new DefaultMuleMessage(req));
+    // System.out.println(result.getPayloadAsString());
+    // assertNotNull(result.getPayload());
+    // assertTrue(result.getPayloadAsString().equals("hello"));
+    // }
+
 }

Modified: branches/mule-2.2.x/tests/integration/src/test/resources/org/mule/test/integration/transport/cxf/cxf-over-jms-config.xml (16278 => 16279)

--- branches/mule-2.2.x/tests/integration/src/test/resources/org/mule/test/integration/transport/cxf/cxf-over-jms-config.xml	2009-12-17 02:57:11 UTC (rev 16278)
+++ branches/mule-2.2.x/tests/integration/src/test/resources/org/mule/test/integration/transport/cxf/cxf-over-jms-config.xml	2009-12-17 13:04:29 UTC (rev 16279)
@@ -45,6 +45,25 @@
                 </chaining-router>
             </outbound>
         </service>
+        
+        <service name="TestCxfJmsProxy">
+            <inbound>
+                <cxf:inbound-endpoint address="http://localhost:63081/services/testBridge" proxy="true" synchronous="true" payload="envelope"/>
+            </inbound>
+            <outbound>
+                <pass-through-router>
+                    <cxf:outbound-endpoint address="jms://testEcho" proxy="true" synchronous="true" payload="envelope"/>
+                </pass-through-router>
+            </outbound>
+        </service>
+
+        <service name="TestEcho">
+            <inbound>
+                <cxf:inbound-endpoint address="jms://TestEcho" frontend="simple" synchronous="true"/>
+            </inbound>
+            <echo-component/>
+        </service>
+        
     </model>
     
 </mule>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule Commits

[mule-jira] Created: (MULE-4677) Issues attempting to implement sync proxy with cxf over jms

2009-12-17T05:03:22Z

Issues attempting to implement sync proxy with cxf over jms
-----------------------------------------------------------

Key: MULE-4677
URL: http://www.mulesource.org/jira/browse/MULE-4677
Project: Mule
Issue Type: Bug
Components: Transport: CXF / XFire, Transport: JMS
Affects Versions: 2.2.4 (EE only)
Reporter: Daniel Feist
Assignee: Daniel Feist

It appears that when attempting to proxy a cxf when using jms as a transport the response doesn't make it back from the echo service. This may be an issue with the temporary rely queue.

{code:xml}
<service name="TestCxfJmsProxy">
<inbound>
<cxf:inbound-endpoint address="http://localhost:63081/services/testBridge" proxy="true" synchronous="true" payload="envelope"/>
</inbound>
<outbound>
<pass-through-router>
<cxf:outbound-endpoint address="jms://testEcho" proxy="true" synchronous="true" payload="envelope"/>
</pass-through-router>
</outbound>
</service>

<service name="TestEcho">
<inbound>
<cxf:inbound-endpoint address="jms://TestEcho" frontend="simple" synchronous="true"/>
</inbound>
<echo-component/>
</service>
{copde}

--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://www.mulesource.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Issues

RE: source code of jdbc transport

2009-12-17T03:58:11Z

Hi,

You'll find it on the Mulesoft website on the Mule downloads page.

You could also go to the Mule SVN repository to retrieve it.

Kevin.

-----Original Message-----
From: ust3000 [mailto:mule.user.relay@...]
Sent: 17 December 2009 11:49
To: user@...
Subject: [mule-user] source code of jdbc transport

*************************************

This e-mail has been received by the Revenue Internet e-mail service. (IP)

*************************************

Hi

How can I get source code of jdbc transport? JIRA ?

thank

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

*********************************************************************

Please note that Revenue cannot guarantee that any personal
and sensitive data, sent in plain text via standard email,
is fully secure. Customers who choose to use this channel
are deemed to have accepted any risk involved. The alternative
communication methods offered by Revenue include standard post
and the option to register for our (encrypted) secure email service.
http://www.revenue.ie/en/practitioner/secure-email.html

*********************************************************************

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - User

source code of jdbc transport

2009-12-17T03:49:16Z

Hi

How can I get source code of jdbc transport? JIRA ?

thank

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - User

[mule-builds] [Bamboo] Mule - Mule 2.2.x (2.2.5-SNAPSHOT) Snapshot Deployment build 313 was SUCCESSFUL. Change made by Dirk Olmes, Daniel Zapata and Daniel Feist

2009-12-16T23:17:47Z

The project Mule - Mule 2.2.x (2.2.5-SNAPSHOT) Snapshot Deployment has the following 7 changes by 3 authors:

*Dirk Olmes* made the following changes at

Comment:
roll back the test exclusion on JAXP. Xerces/Xalan seems to be the only valid combo for endorsing the JDK anyway now, given that JAXP hasn't been touched for ages now.

> /branches/mule-2.2.x/modules/xml/src/test/java/org/mule/routing/filters/xml/IsXmlFilterTestCase.java (16269)
*Daniel Zapata* made the following changes at

Comment:
fix and comment out test for MULE-4584 / EE-1711 until the issue is fixed; re-enable accidentally disabled tests

> /branches/mule-2.2.x/transports/cxf/src/test/java/org/mule/transport/cxf/ProxyTestCase.java (16274)
*Dirk Olmes* made the following changes at

Comment:
MULE-4657 (SslCertificateTestCase fails on IBM JDK): re-generate the keystores with certificates that are not expired (they won't until 2037) which makes the test pass on Sun and on IBM JDK.

> /branches/mule-2.2.x/transports/ssl/src/test/resources/README.txt (16270)
> /branches/mule-2.2.x/transports/ssl/src/test/resources/muleserver.cer (16270)
> /branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificateCallback.java (16270)
> /branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslCertificateTestCase.java (16270)
> /branches/mule-2.2.x/transports/ssl/src/test/resources/serverKeystore (16270)
> /branches/mule-2.2.x/transports/ssl/src/test/resources/muleclient.cer (16270)
> /branches/mule-2.2.x/transports/ssl/src/test/resources/clientKeystore (16270)
> /branches/mule-2.2.x/transports/ssl/src/test/resources/trustStore (16270)
*Dirk Olmes* made the following changes at

Comment:
MULE-4658 (SslCertificatesTestCase fails on IBM JDK): this was actually fixed in MULE-4657 but some refactorings never hurt

> /branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificatesCallback.java (16272)
> /branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslCertificatesTestCase.java (16272)
*Daniel Feist* made the following changes at

Comment:
Revert r16079 for JettyContinuationsReceiverServlet as this should not have been changed.

> /branches/mule-2.2.x/transports/jetty/src/main/java/org/mule/transport/servlet/jetty/JettyContinuationsReceiverServlet.java (16268)
*Dirk Olmes* made the following changes at

Comment:
MULE-4659 is actually fixed as part of MULE-4657. This commit just takes out the test exclusion and updates the JIRA reference.

> /branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java (16275)
*Dirk Olmes* made the following changes at

Comment:
The root cause of this issue is fixed in MULE-4657. Re-enable the test on IBM JDK

> /branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java (16277)

---------------------------------------------------------------------------------------

No tests were executed.

Click http://bamboo.mulesource.org/browse/MULE-MULE22SNAPSHOTS-313 to find out more.

Thanks,

Bamboo

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Builds

[mule-builds] [Bamboo] Mule - Mule 3.x Snapshot Deployment build 272 was SUCCESSFUL. Change made by Dirk Olmes

2009-12-16T22:51:27Z

The project Mule - Mule 3.x Snapshot Deployment has the following 4 changes by 1 author:

*Dirk Olmes* made the following changes at

Comment:
Merged revisions 16270 via svnmerge from
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
r16270 | dirk.olmes | 2009-12-16 17:33:34 +0100 (Wed, 16 Dec 2009) | 1 line

MULE-4657 (SslCertificateTestCase fails on IBM JDK): re-generate the keystores with certificates that are not expired (they won't until 2037) which makes the test pass on Sun and on IBM JDK.
........

> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslCertificateTestCase.java (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/muleserver.cer (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/muleclient.cer (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/clientKeystore (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/trustStore (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/serverKeystore (16271)
> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificateCallback.java (16271)
> /branches/mule-3.x (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/README.txt (16271)
*Dirk Olmes* made the following changes at

Comment:
Merged revisions 16272 via svnmerge from
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
r16272 | dirk.olmes | 2009-12-16 18:08:18 +0100 (Wed, 16 Dec 2009) | 2 lines

MULE-4658 (SslCertificatesTestCase fails on IBM JDK): this was actually fixed in MULE-4657 but some refactorings never hurt
........

> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslCertificatesTestCase.java (16273)
> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificatesCallback.java (16273)
> /branches/mule-3.x (16273)
*Dirk Olmes* made the following changes at

Comment:
Merged revisions 16275 via svnmerge from
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
r16275 | dirk.olmes | 2009-12-17 03:40:03 +0100 (Thu, 17 Dec 2009) | 1 line

MULE-4659 is actually fixed as part of MULE-4657. This commit just takes out the test exclusion and updates the JIRA reference.
........

> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java (16276)
> /branches/mule-3.x (16276)
*Dirk Olmes* made the following changes at

Comment:
Merged revisions 16277 via svnmerge from
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
r16277 | dirk.olmes | 2009-12-17 03:55:01 +0100 (Thu, 17 Dec 2009) | 1 line

The root cause of this issue is fixed in MULE-4657. Re-enable the test on IBM JDK
........

> /branches/mule-3.x (16278)
> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java (16278)

---------------------------------------------------------------------------------------

No tests were executed.

Click http://bamboo.mulesource.org/browse/MULE-MULE3XSNAPSHOTS-272 to find out more.

Thanks,

Bamboo

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Builds

[mule-builds] [Bamboo] Mule - Mule 3.x (3.0.0-M2-SNAPSHOT) JDK5 build 590 has FAILED (1 tests failed, no failures were new). Change made by Dirk Olmes

2009-12-16T21:17:52Z

The project Mule - Mule 3.x (3.0.0-M2-SNAPSHOT) JDK5 has the following 1 change by 1 author:

*Dirk Olmes* made the following changes at

Comment:
Merged revisions 16277 via svnmerge from
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
r16277 | dirk.olmes | 2009-12-17 03:55:01 +0100 (Thu, 17 Dec 2009) | 1 line

The root cause of this issue is fixed in MULE-4657. Re-enable the test on IBM JDK
........

> /branches/mule-3.x (16278)
> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java (16278)

---------------------------------------------------------------------------------------

The build has 1 failed test and 2330 successful tests.

Click http://bamboo.mulesource.org/browse/MULE-MULE3JDK5-590 to find out more.

Thanks,

Bamboo

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Builds

[mule-builds] [Bamboo] Mule - Mule 2.2.x (2.2.5-SNAPSHOT) JDK5 build 530 has FAILED (1 tests failed). Change made by Dirk Olmes

2009-12-16T20:36:53Z

The project Mule - Mule 2.2.x (2.2.5-SNAPSHOT) JDK5 has the following 2 changes by 1 author:

*Dirk Olmes* made the following changes at

Comment:
MULE-4659 is actually fixed as part of MULE-4657. This commit just takes out the test exclusion and updates the JIRA reference.

> /branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java (16275)
*Dirk Olmes* made the following changes at

Comment:
The root cause of this issue is fixed in MULE-4657. Re-enable the test on IBM JDK

> /branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java (16277)

---------------------------------------------------------------------------------------

The build has 1 failed test and 2839 successful tests.

Click http://bamboo.mulesource.org/browse/MULE-MULE22JDK5-530 to find out more.

Thanks,

Bamboo

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Builds

[mule-builds] [Bamboo] Mule - Mule 3.x (3.0.0-M2-SNAPSHOT) JDK5 build 589 has FAILED (1 tests failed, no failures were new). Change made by Dirk Olmes

2009-12-16T19:30:36Z

The project Mule - Mule 3.x (3.0.0-M2-SNAPSHOT) JDK5 has the following 1 change by 1 author:

*Dirk Olmes* made the following changes at

Comment:
Merged revisions 16275 via svnmerge from
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
r16275 | dirk.olmes | 2009-12-17 03:40:03 +0100 (Thu, 17 Dec 2009) | 1 line

MULE-4659 is actually fixed as part of MULE-4657. This commit just takes out the test exclusion and updates the JIRA reference.
........

> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java (16276)
> /branches/mule-3.x (16276)

---------------------------------------------------------------------------------------

The build has 1 failed test and 2330 successful tests.

Click http://bamboo.mulesource.org/browse/MULE-MULE3JDK5-589 to find out more.

Thanks,

Bamboo

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Builds

[mule-jira] Closed: (MULE-4664) AsynchronousSslMule1854TestCase fails with IBM JDK

2009-12-16T18:58:22Z

[ http://www.mulesource.org/jira/browse/MULE-4664?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Dirk Olmes closed MULE-4664.
----------------------------

Resolution: Fixed

> AsynchronousSslMule1854TestCase fails with IBM JDK
> --------------------------------------------------
>
> Key: MULE-4664
> URL: http://www.mulesource.org/jira/browse/MULE-4664
> Project: Mule
> Issue Type: Sub-task
> Components: Transport: TCP / UDP / SSL / Multicast
> Affects Versions: 2.2.3 (EE only)
> Reporter: Dirk Olmes
> Assignee: Dirk Olmes
> Priority: Major
> Fix For: 2.2.5 (EE only)
>
>
> {code}
> org.mule.api.transport.ReceiveException: Failed to receive event over: DefaultInboundEndpoint{endpointUri=ssl://localhost:60196, connector=SslConnector{this=4a884a88, started=true, initialised=true, name='SslConnector', disposed=false, numberOfConcurrentTransactedReceivers=4, createMultipleTransactedReceivers=true, connected=true, supportedProtocols=[ssl], serviceOverrides=null}, transformer=[], name='asyncEndpoint', properties={}, transactionConfig=Transaction{factory=null, action=NEVER, timeout=0}, filter=null, deleteUnacceptedMessages=false, securityFilter=null, synchronous=false, initialState=started, responseTimeout=10000, endpointEncoding=UTF-8} (timeout=5000)
> at org.mule.module.client.MuleClient.request(MuleClient.java:692)
> at org.mule.transport.ssl.issues.AsynchronousSslMule1854TestCase.testAsynchronous(AsynchronousSslMule1854TestCase.java:32)
> Caused by: org.mule.api.transport.ReceiveException: Failed to receive event over: DefaultInboundEndpoint{endpointUri=ssl://localhost:60196, connector=SslConnector{this=4a884a88, started=true, initialised=true, name='SslConnector', disposed=false, numberOfConcurrentTransactedReceivers=4, createMultipleTransactedReceivers=true, connected=true, supportedProtocols=[ssl], serviceOverrides=null}, transformer=[], name='asyncEndpoint', properties={}, transactionConfig=Transaction{factory=null, action=NEVER, timeout=0}, filter=null, deleteUnacceptedMessages=false, securityFilter=null, synchronous=false, initialState=started, responseTimeout=10000, endpointEncoding=UTF-8} (timeout=5000)
> at org.mule.transport.AbstractMessageRequester.request(AbstractMessageRequester.java:91)
> at org.mule.transport.AbstractConnector.request(AbstractConnector.java:2048)
> at org.mule.endpoint.DefaultInboundEndpoint.request(DefaultInboundEndpoint.java:59)
> at org.mule.module.client.MuleClient.request(MuleClient.java:683)
> ... 29 more
> Caused by: java.net.SocketException: Socket Closed
> at java.net.PlainSocketImpl.setOption(PlainSocketImpl.java:258)
> at java.net.Socket.setSoTimeout(Socket.java:1029)
> at com.ibm.jsse2.jc.setSoTimeout(jc.java:580)
> at org.mule.transport.tcp.TcpMessageDispatcher.receiveFromSocket(TcpMessageDispatcher.java:148)
> at org.mule.transport.tcp.TcpMessageRequester.doRequest(TcpMessageRequester.java:56)
> at org.mule.transport.AbstractMessageRequester.request(AbstractMessageRequester.java:74)
> ... 32 more
> {code}
> This seems to be related to IBMs different crypto APIs

--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://www.mulesource.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Issues

[mule-jira] Commented: (MULE-4664) AsynchronousSslMule1854TestCase fails with IBM JDK

2009-12-16T18:58:22Z

[ http://www.mulesource.org/jira/browse/MULE-4664?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=32873#action_32873 ]

Dirk Olmes commented on MULE-4664:
----------------------------------

The root cause was fixed in MULE-4657.

2.2.x: http://fisheye.codehaus.org/changelog/mule/?cs=16277
3.x: http://fisheye.codehaus.org/changelog/mule/?cs=16278

From forum: Mule - Issues

[mule-scm] [mule] [16278] branches/mule-3.x: Merged revisions 16277 via svnmerge from

2009-12-16T18:57:11Z

[mule] [16278] branches/mule-3.x: Merged revisions 16277 via svnmerge from

Revision: 16278
Author: dirk.olmes
Date: 2009-12-16 20:57:11 -0600 (Wed, 16 Dec 2009)

Log Message

Merged revisions 16277 via svnmerge from 
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
  r16277 | dirk.olmes | 2009-12-17 03:55:01 +0100 (Thu, 17 Dec 2009) | 1 line
  
  The root cause of this issue is fixed in MULE-4657. Re-enable the test on IBM JDK
........

Modified Paths

branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java

Property Changed

branches/mule-3.x/

Diff

Property changes: branches/mule-3.x

Name: svnmerge-integrated
   - /branches/mule-3.x-xmpp:1-15727 /branches/mule-2.2.x:1-14052,14055-14056,14058-14062,14064,14066-14073,14076-14084,14086-14088,14091-14095,14097-14098,14100-14101,14103-14104,14106-14109,14111-14115,14117-14121,14123-14132,14135-14140,14142-14149,14152-14154,14156-14162,14165-14171,14173-14180,14182,14184-14189,14191-14195,14197-14203,14205,14207-14208,14210-14211,14214-14215,14217-14227,14230,14232-14236,14239,14241,14244,14246-14248,14250,14252-14253,14255-14256,14258-14263,14266-14269,14271-14278,14281-14282,14284,14286-14288,14292-14295,14297-14299,14301-14303,14306-14308,14310-14311,14313-14319,14321-14325,14327-14329,14331,14333-14339,14341-14343,14345-14357,14364-14368,14370-14374,14376-14378,14380-14381,14383-14397,14399-14400,14402,14404-14405,14407-14408,14410-14411,14413-14418,14421-14434,14436,14438,14440-14444,14449-14457,14459,14461-14462,14464-14469,14471-14475,14478-14480,14482-14484,14486-14504,14508-14535,14537-14592,14594-14595,14597-14638,14640-14644,
 14646-14647,14649-14761,14763-14838,14840-14869,14872-14881,14890,14897,14899,14904,14906-14908,14910-14911,14913,14916,14921,14943,14946-14948,14969,14991,15010,15012,15022,15027,15040,15044,15063,15066,15076,15088,15094,15098,15101,15107,15112,15126,15132,15143,15189,15192,15200,15204,15207,15215,15220,15229-15230,15241,15245,15271,15284,15291,15293-15294,15296,15298-15299,15302,15307,15311,15315,15317-15322,15324-15355,15357-15365,15367,15369-15372,15374,15377,15387,15418,15420-15430,15433,15440,15442-15443,15450,15452,15456-15462,15465,15467-15470,15489-15492,15501-15502,15513,15528,15532,15554,15556-15561,15563-15586,15588-15589,15591-15596,15599-15665,15667-15688,15690-15753,15755-15756,15758-15771,15773-15777,15780-15794,15796-15800,15802-15804,15806-15828,15830-15833,15835-15889,15892-15925,15927-15928,15930-15931,15933-15985,15988-15993,15995-15997,15999-16002,16008-16009,16011,16013-16021,16023-16028,16030-16031,16033-16081,16085-16086,16089-16090,16092-16096,16098
 -16149,16153,16155,16157,16159,16167-16183,16186-16188,16193-16201,16205-16209,16211-16212,16214-16215,16217,16219-16220,16222-16232,16250,16265,16270,16272,16275 /branches/mule-3.x-messaging:1-15430
   + /branches/mule-2.2.x:1-14052,14055-14056,14058-14062,14064,14066-14073,14076-14084,14086-14088,14091-14095,14097-14098,14100-14101,14103-14104,14106-14109,14111-14115,14117-14121,14123-14132,14135-14140,14142-14149,14152-14154,14156-14162,14165-14171,14173-14180,14182,14184-14189,14191-14195,14197-14203,14205,14207-14208,14210-14211,14214-14215,14217-14227,14230,14232-14236,14239,14241,14244,14246-14248,14250,14252-14253,14255-14256,14258-14263,14266-14269,14271-14278,14281-14282,14284,14286-14288,14292-14295,14297-14299,14301-14303,14306-14308,14310-14311,14313-14319,14321-14325,14327-14329,14331,14333-14339,14341-14343,14345-14357,14364-14368,14370-14374,14376-14378,14380-14381,14383-14397,14399-14400,14402,14404-14405,14407-14408,14410-14411,14413-14418,14421-14434,14436,14438,14440-14444,14449-14457,14459,14461-14462,14464-14469,14471-14475,14478-14480,14482-14484,14486-14504,14508-14535,14537-14592,14594-14595,14597-14638,14640-14644,14646-14647,14649-14761,14763-14
 838,14840-14869,14872-14881,14890,14897,14899,14904,14906-14908,14910-14911,14913,14916,14921,14943,14946-14948,14969,14991,15010,15012,15022,15027,15040,15044,15063,15066,15076,15088,15094,15098,15101,15107,15112,15126,15132,15143,15189,15192,15200,15204,15207,15215,15220,15229-15230,15241,15245,15271,15284,15291,15293-15294,15296,15298-15299,15302,15307,15311,15315,15317-15322,15324-15355,15357-15365,15367,15369-15372,15374,15377,15387,15418,15420-15430,15433,15440,15442-15443,15450,15452,15456-15462,15465,15467-15470,15489-15492,15501-15502,15513,15528,15532,15554,15556-15561,15563-15586,15588-15589,15591-15596,15599-15665,15667-15688,15690-15753,15755-15756,15758-15771,15773-15777,15780-15794,15796-15800,15802-15804,15806-15828,15830-15833,15835-15889,15892-15925,15927-15928,15930-15931,15933-15985,15988-15993,15995-15997,15999-16002,16008-16009,16011,16013-16021,16023-16028,16030-16031,16033-16081,16085-16086,16089-16090,16092-16096,16098-16149,16153,16155,16157,16159,1
 6167-16183,16186-16188,16193-16201,16205-16209,16211-16212,16214-16215,16217,16219-16220,16222-16232,16250,16265,16270,16272,16275,16277 /branches/mule-3.x-xmpp:1-15727 /branches/mule-3.x-messaging:1-15430

Modified: branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java (16277 => 16278)

--- branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java	2009-12-17 02:55:01 UTC (rev 16277)
+++ branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java	2009-12-17 02:57:11 UTC (rev 16278)
@@ -13,19 +13,9 @@
 import org.mule.api.MuleMessage;
 import org.mule.module.client.MuleClient;
 import org.mule.tck.FunctionalTestCase;
-import org.mule.util.SystemUtils;
 
 public class AsynchronousSslMule1854TestCase extends FunctionalTestCase 
 {
-    protected static String TEST_MESSAGE = "Test Request";
-
-    @Override
-    protected boolean isDisabledInThisEnvironment()
-    {
-        // MULE-4664
-        return SystemUtils.isIbmJDK();
-    }
-
     protected String getConfigResources()
     {
         return "ssl-functional-test.xml";
@@ -35,10 +25,10 @@
     {
         MuleClient client = new MuleClient();
         client.dispatch("asyncEndpoint", TEST_MESSAGE, null);
-        // MULE-2754
+        // MULE-2757
         Thread.sleep(100);
         MuleMessage response = client.request("asyncEndpoint", 5000);
         assertNotNull("Response is null", response);
         assertEquals(TEST_MESSAGE + " Received Async", response.getPayloadAsString());
     }
-}
\ No newline at end of file
+}

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule Commits

[mule-scm] [mule] [16277] branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java: The root cause of this issue is fixed in MULE-4657.

2009-12-16T18:55:01Z

[mule] [16277] branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java: The root cause of this issue is fixed in MULE-4657.

Revision: 16277
Author: dirk.olmes
Date: 2009-12-16 20:55:01 -0600 (Wed, 16 Dec 2009)

Log Message

The root cause of this issue is fixed in MULE-4657. Re-enable the test on IBM JDK

Modified Paths

branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java

Diff

Modified: branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java (16276 => 16277)

--- branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java	2009-12-17 02:44:12 UTC (rev 16276)
+++ branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/issues/AsynchronousSslMule1854TestCase.java	2009-12-17 02:55:01 UTC (rev 16277)
@@ -13,19 +13,9 @@
 import org.mule.api.MuleMessage;
 import org.mule.module.client.MuleClient;
 import org.mule.tck.FunctionalTestCase;
-import org.mule.util.SystemUtils;
 
 public class AsynchronousSslMule1854TestCase extends FunctionalTestCase 
 {
-    protected static String TEST_MESSAGE = "Test Request";
-
-    @Override
-    protected boolean isDisabledInThisEnvironment()
-    {
-        // MULE-4664
-        return SystemUtils.isIbmJDK();
-    }
-
     protected String getConfigResources()
     {
         return "ssl-functional-test.xml";
@@ -35,10 +25,10 @@
     {
         MuleClient client = new MuleClient();
         client.dispatch("asyncEndpoint", TEST_MESSAGE, null);
-        // MULE-2754
+        // MULE-2757
         Thread.sleep(100);
         MuleMessage response = client.request("asyncEndpoint", 5000);
         assertNotNull("Response is null", response);
         assertEquals(TEST_MESSAGE + " Received Async", response.getPayloadAsString());
     }
-}
\ No newline at end of file
+}

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule Commits

[mule-jira] Closed: (MULE-4659) SslFunctionalTestCase fails on IBM JDK

2009-12-16T18:45:22Z

[ http://www.mulesource.org/jira/browse/MULE-4659?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Dirk Olmes closed MULE-4659.
----------------------------

Resolution: Fixed

> SslFunctionalTestCase fails on IBM JDK
> --------------------------------------
>
> Key: MULE-4659
> URL: http://www.mulesource.org/jira/browse/MULE-4659
> Project: Mule
> Issue Type: Sub-task
> Components: Transport: TCP / UDP / SSL / Multicast
> Affects Versions: 2.2.3 (EE only)
> Reporter: Dirk Olmes
> Assignee: Dirk Olmes
> Priority: Major
> Fix For: 2.2.5 (EE only)
>
>
> {code}
> org.mule.api.transport.DispatchException: Failed to route event via endpoint: DefaultOutboundEndpoint{endpointUri=ssl://localhost:60198, connector=SslConnector{this=58225822, started=true, initialised=true, name='SslConnector', disposed=false, numberOfConcurrentTransactedReceivers=4, createMultipleTransactedReceivers=true, connected=true, supportedProtocols=[ssl], serviceOverrides=null}, transformer=[], name='sendEndpoint', properties={}, transactionConfig=Transaction{factory=null, action=NEVER, timeout=0}, filter=null, deleteUnacceptedMessages=false, securityFilter=null, synchronous=true, initialState=started, responseTimeout=10000, endpointEncoding=UTF-8}. Message payload is of type: String
> at org.mule.transport.AbstractMessageDispatcher.send(AbstractMessageDispatcher.java:198)
> at org.mule.transport.AbstractConnector.send(AbstractConnector.java:2102)
> at org.mule.endpoint.DefaultOutboundEndpoint.send(DefaultOutboundEndpoint.java:97)
> at org.mule.DefaultMuleSession.sendEvent(DefaultMuleSession.java:316)
> at org.mule.module.client.MuleClient.send(MuleClient.java:649)
> at org.mule.module.client.MuleClient.send(MuleClient.java:626)
> at org.mule.module.client.MuleClient.send(MuleClient.java:579)
> at org.mule.transport.ssl.SslFunctionalTestCase.testSend(SslFunctionalTestCase.java:36)
> Caused by: javax.net.ssl.SSLHandshakeException: com.ibm.jsse2.util.h: Certificate expired
> at com.ibm.jsse2.n.a(n.java:3)
> at com.ibm.jsse2.jc.a(jc.java:501)
> at com.ibm.jsse2.db.a(db.java:144)
> at com.ibm.jsse2.db.a(db.java:416)
> at com.ibm.jsse2.eb.a(eb.java:145)
> at com.ibm.jsse2.eb.a(eb.java:291)
> at com.ibm.jsse2.db.m(db.java:192)
> at com.ibm.jsse2.db.a(db.java:79)
> at com.ibm.jsse2.jc.a(jc.java:184)
> at com.ibm.jsse2.jc.g(jc.java:257)
> at com.ibm.jsse2.jc.a(jc.java:295)
> at com.ibm.jsse2.j.write(j.java:3)
> at java.io.BufferedOutputStream.flushBuffer(BufferedOutputStream.java:88)
> at java.io.BufferedOutputStream.flush(BufferedOutputStream.java:146)
> at org.mule.transport.tcp.TcpMessageDispatcher.write(TcpMessageDispatcher.java:115)
> at org.mule.transport.tcp.TcpMessageDispatcher.dispatchToSocket(TcpMessageDispatcher.java:108)
> at org.mule.transport.tcp.TcpMessageDispatcher.doSend(TcpMessageDispatcher.java:60)
> at org.mule.transport.AbstractMessageDispatcher.send(AbstractMessageDispatcher.java:162)
> ... 35 more
> Caused by: com.ibm.jsse2.util.h: Certificate expired
> at com.ibm.jsse2.util.g.b(g.java:110)
> at com.ibm.jsse2.util.e.a(e.java:2)
> at com.ibm.jsse2.yb.checkServerTrusted(yb.java:46)
> at com.ibm.jsse2.hb.checkServerTrusted(hb.java:22)
> at com.ibm.jsse2.eb.a(eb.java:8)
> ... 48 more
> {code}

From forum: Mule - Issues

[mule-jira] Commented: (MULE-4659) SslFunctionalTestCase fails on IBM JDK

2009-12-16T18:45:22Z

[ http://www.mulesource.org/jira/browse/MULE-4659?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=32872#action_32872 ]

Dirk Olmes commented on MULE-4659:
----------------------------------

The actual fix is in MULE-4657.

Some minor refactorings:
2.2.x: http://fisheye.codehaus.org/changelog/mule/?cs=16275
3.x: http://fisheye.codehaus.org/changelog/mule/?cs=16276

From forum: Mule - Issues

[mule-scm] [mule] [16276] branches/mule-3.x: Merged revisions 16275 via svnmerge from

2009-12-16T18:44:12Z

[mule] [16276] branches/mule-3.x: Merged revisions 16275 via svnmerge from

Revision: 16276
Author: dirk.olmes
Date: 2009-12-16 20:44:12 -0600 (Wed, 16 Dec 2009)

Log Message

Merged revisions 16275 via svnmerge from 
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
  r16275 | dirk.olmes | 2009-12-17 03:40:03 +0100 (Thu, 17 Dec 2009) | 1 line
  
  MULE-4659 is actually fixed as part of MULE-4657. This commit just takes out the test exclusion and updates the JIRA reference.
........

Modified Paths

branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java

Property Changed

branches/mule-3.x/

Diff

Property changes: branches/mule-3.x

Name: svnmerge-integrated
   - /branches/mule-2.2.x:1-14052,14055-14056,14058-14062,14064,14066-14073,14076-14084,14086-14088,14091-14095,14097-14098,14100-14101,14103-14104,14106-14109,14111-14115,14117-14121,14123-14132,14135-14140,14142-14149,14152-14154,14156-14162,14165-14171,14173-14180,14182,14184-14189,14191-14195,14197-14203,14205,14207-14208,14210-14211,14214-14215,14217-14227,14230,14232-14236,14239,14241,14244,14246-14248,14250,14252-14253,14255-14256,14258-14263,14266-14269,14271-14278,14281-14282,14284,14286-14288,14292-14295,14297-14299,14301-14303,14306-14308,14310-14311,14313-14319,14321-14325,14327-14329,14331,14333-14339,14341-14343,14345-14357,14364-14368,14370-14374,14376-14378,14380-14381,14383-14397,14399-14400,14402,14404-14405,14407-14408,14410-14411,14413-14418,14421-14434,14436,14438,14440-14444,14449-14457,14459,14461-14462,14464-14469,14471-14475,14478-14480,14482-14484,14486-14504,14508-14535,14537-14592,14594-14595,14597-14638,14640-14644,14646-14647,14649-14761,14763-14
 838,14840-14869,14872-14881,14890,14897,14899,14904,14906-14908,14910-14911,14913,14916,14921,14943,14946-14948,14969,14991,15010,15012,15022,15027,15040,15044,15063,15066,15076,15088,15094,15098,15101,15107,15112,15126,15132,15143,15189,15192,15200,15204,15207,15215,15220,15229-15230,15241,15245,15271,15284,15291,15293-15294,15296,15298-15299,15302,15307,15311,15315,15317-15322,15324-15355,15357-15365,15367,15369-15372,15374,15377,15387,15418,15420-15430,15433,15440,15442-15443,15450,15452,15456-15462,15465,15467-15470,15489-15492,15501-15502,15513,15528,15532,15554,15556-15561,15563-15586,15588-15589,15591-15596,15599-15665,15667-15688,15690-15753,15755-15756,15758-15771,15773-15777,15780-15794,15796-15800,15802-15804,15806-15828,15830-15833,15835-15889,15892-15925,15927-15928,15930-15931,15933-15985,15988-15993,15995-15997,15999-16002,16008-16009,16011,16013-16021,16023-16028,16030-16031,16033-16081,16085-16086,16089-16090,16092-16096,16098-16149,16153,16155,16157,16159,1
 6167-16183,16186-16188,16193-16201,16205-16209,16211-16212,16214-16215,16217,16219-16220,16222-16232,16250,16265,16270,16272 /branches/mule-3.x-xmpp:1-15727 /branches/mule-3.x-messaging:1-15430
   + /branches/mule-3.x-xmpp:1-15727 /branches/mule-2.2.x:1-14052,14055-14056,14058-14062,14064,14066-14073,14076-14084,14086-14088,14091-14095,14097-14098,14100-14101,14103-14104,14106-14109,14111-14115,14117-14121,14123-14132,14135-14140,14142-14149,14152-14154,14156-14162,14165-14171,14173-14180,14182,14184-14189,14191-14195,14197-14203,14205,14207-14208,14210-14211,14214-14215,14217-14227,14230,14232-14236,14239,14241,14244,14246-14248,14250,14252-14253,14255-14256,14258-14263,14266-14269,14271-14278,14281-14282,14284,14286-14288,14292-14295,14297-14299,14301-14303,14306-14308,14310-14311,14313-14319,14321-14325,14327-14329,14331,14333-14339,14341-14343,14345-14357,14364-14368,14370-14374,14376-14378,14380-14381,14383-14397,14399-14400,14402,14404-14405,14407-14408,14410-14411,14413-14418,14421-14434,14436,14438,14440-14444,14449-14457,14459,14461-14462,14464-14469,14471-14475,14478-14480,14482-14484,14486-14504,14508-14535,14537-14592,14594-14595,14597-14638,14640-14644,
 14646-14647,14649-14761,14763-14838,14840-14869,14872-14881,14890,14897,14899,14904,14906-14908,14910-14911,14913,14916,14921,14943,14946-14948,14969,14991,15010,15012,15022,15027,15040,15044,15063,15066,15076,15088,15094,15098,15101,15107,15112,15126,15132,15143,15189,15192,15200,15204,15207,15215,15220,15229-15230,15241,15245,15271,15284,15291,15293-15294,15296,15298-15299,15302,15307,15311,15315,15317-15322,15324-15355,15357-15365,15367,15369-15372,15374,15377,15387,15418,15420-15430,15433,15440,15442-15443,15450,15452,15456-15462,15465,15467-15470,15489-15492,15501-15502,15513,15528,15532,15554,15556-15561,15563-15586,15588-15589,15591-15596,15599-15665,15667-15688,15690-15753,15755-15756,15758-15771,15773-15777,15780-15794,15796-15800,15802-15804,15806-15828,15830-15833,15835-15889,15892-15925,15927-15928,15930-15931,15933-15985,15988-15993,15995-15997,15999-16002,16008-16009,16011,16013-16021,16023-16028,16030-16031,16033-16081,16085-16086,16089-16090,16092-16096,16098
 -16149,16153,16155,16157,16159,16167-16183,16186-16188,16193-16201,16205-16209,16211-16212,16214-16215,16217,16219-16220,16222-16232,16250,16265,16270,16272,16275 /branches/mule-3.x-messaging:1-15430

Modified: branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java (16275 => 16276)

--- branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java	2009-12-17 02:40:03 UTC (rev 16275)
+++ branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java	2009-12-17 02:44:12 UTC (rev 16276)
@@ -18,18 +18,9 @@
 import org.mule.tck.functional.EventCallback;
 import org.mule.tck.functional.FunctionalTestComponent;
 import org.mule.tck.testmodels.mule.TestSedaService;
-import org.mule.util.SystemUtils;
 
 public class SslFunctionalTestCase extends FunctionalTestCase 
 {
-    @Override
-    protected boolean isDisabledInThisEnvironment()
-    {
-        // MULE-4659
-        return SystemUtils.isIbmJDK();
-    }
-
-    protected static String TEST_MESSAGE = "Test Request";
     private static int NUM_MESSAGES = 100;
 
     protected String getConfigResources()
@@ -69,11 +60,10 @@
     {
         MuleClient client = new MuleClient();
         client.dispatch("asyncEndpoint", TEST_MESSAGE, null);
-        // MULE-2754
+        // MULE-2757
         Thread.sleep(100);
         MuleMessage response = client.request("asyncEndpoint", 5000);
         assertNotNull("Response is null", response);
         assertEquals(TEST_MESSAGE + " Received Async", response.getPayloadAsString());
     }
-
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule Commits

[mule-scm] [mule] [16275] branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java: MULE-4659 is actually fixed as part of MULE-4657.

2009-12-16T18:40:04Z

[mule] [16275] branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java: MULE-4659 is actually fixed as part of MULE-4657.

Revision: 16275
Author: dirk.olmes
Date: 2009-12-16 20:40:03 -0600 (Wed, 16 Dec 2009)

Log Message

MULE-4659 is actually fixed as part of MULE-4657. This commit just takes out the test exclusion and updates the JIRA reference.

Modified Paths

branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java

Diff

Modified: branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java (16274 => 16275)

--- branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java	2009-12-17 01:20:38 UTC (rev 16274)
+++ branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslFunctionalTestCase.java	2009-12-17 02:40:03 UTC (rev 16275)
@@ -18,18 +18,9 @@
 import org.mule.tck.functional.EventCallback;
 import org.mule.tck.functional.FunctionalTestComponent;
 import org.mule.tck.testmodels.mule.TestSedaService;
-import org.mule.util.SystemUtils;
 
 public class SslFunctionalTestCase extends FunctionalTestCase 
 {
-    @Override
-    protected boolean isDisabledInThisEnvironment()
-    {
-        // MULE-4659
-        return SystemUtils.isIbmJDK();
-    }
-
-    protected static String TEST_MESSAGE = "Test Request";
     private static int NUM_MESSAGES = 100;
 
     protected String getConfigResources()
@@ -69,11 +60,10 @@
     {
         MuleClient client = new MuleClient();
         client.dispatch("asyncEndpoint", TEST_MESSAGE, null);
-        // MULE-2754
+        // MULE-2757
         Thread.sleep(100);
         MuleMessage response = client.request("asyncEndpoint", 5000);
         assertNotNull("Response is null", response);
         assertEquals(TEST_MESSAGE + " Received Async", response.getPayloadAsString());
     }
-
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule Commits

[mule-builds] [Bamboo] Mule - Mule 2.2.x (2.2.5-SNAPSHOT) JDK5 build 529 was SUCCESSFUL (with 2840 tests). Change made by Daniel Zapata

2009-12-16T18:23:39Z

The project Mule - Mule 2.2.x (2.2.5-SNAPSHOT) JDK5 has the following 1 change by 1 author:

*Daniel Zapata* made the following changes at

Comment:
fix and comment out test for MULE-4584 / EE-1711 until the issue is fixed; re-enable accidentally disabled tests

> /branches/mule-2.2.x/transports/cxf/src/test/java/org/mule/transport/cxf/ProxyTestCase.java (16274)

---------------------------------------------------------------------------------------

All 2840 tests passed.

Click http://bamboo.mulesource.org/browse/MULE-MULE22JDK5-529 to find out more.

Thanks,

Bamboo

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Builds

Re: dinamically send email (or how to implement Dynamic Recipient List)

2009-12-16T17:26:22Z

Hi Thor,

Unless your intention is to have non-Mule clients talk to this TCP socket, I would suggest to rather use the remote dispatcher agent for this kind of specific Mule Client -> Server communications.

Cheers,

On Wed, Dec 16, 2009 at 4:46 AM, thor silva <mule.user.relay@...> wrote:

Hello all,

I would like to use MuleClient to send emails from an application. The inbound would be an tcp inbound and the outbound would be an smtp outbound. So, how can I set the from, to, subject and the payload of the message (using the MuleClient) to send the email ?

The initial configuration that I am trying is:

<?xml version="1.0" encoding="UTF-8"?>
<mule xmlns="http://www.mulesource.org/schema/mule/core/2.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:pop3s="http://www.mulesource.org/schema/mule/pop3s/2.2"
xmlns:smtps="http://www.mulesource.org/schema/mule/smtps/2.2"
xmlns:pop3="http://www.mulesource.org/schema/mule/pop3/2.2"
xmlns:imap="http://www.mulesource.org/schema/mule/imap/2.2"
xmlns:imaps="http://www.mulesource.org/schema/mule/imaps/2.2"
xmlns:smtp="http://www.mulesource.org/schema/mule/smtp/2.2"
xmlns:email="http://www.mulesource.org/schema/mule/email/2.2"
xmlns:tcp="http://www.mulesource.org/schema/mule/tcp/2.2"
xsi:schemaLocation="
http://www.mulesource.org/schema/mule/pop3s/2.2 http://www.mulesource.org/schema/mule/pop3s/2.2/mule-pop3s.xsd
http://www.mulesource.org/schema/mule/smtps/2.2 http://www.mulesource.org/schema/mule/smtps/2.2/mule-smtps.xsd
http://www.mulesource.org/schema/mule/pop3/2.2 http://www.mulesource.org/schema/mule/pop3/2.2/mule-pop3.xsd
http://www.mulesource.org/schema/mule/imap/2.2 http://www.mulesource.org/schema/mule/imap/2.2/mule-imap.xsd
http://www.mulesource.org/schema/mule/imaps/2.2 http://www.mulesource.org/schema/mule/imaps/2.2/mule-imaps.xsd
http://www.mulesource.org/schema/mule/smtp/2.2 http://www.mulesource.org/schema/mule/smtp/2.2/mule-smtp.xsd
http://www.mulesource.org/schema/mule/email/2.2 http://www.mulesource.org/schema/mule/email/2.2/mule-email.xsd
http://www.mulesource.org/schema/mule/core/2.2 http://www.mulesource.org/schema/mule/core/2.2/mule.xsd
http://www.mulesource.org/schema/mule/tcp/2.2 http://www.mulesource.org/schema/mule/tcp/2.2/mule-tcp.xsd">

<tcp:connector name="tcp_connector" validateConnections="false">
<tcp:streaming-protocol/>
</tcp:connector>

<byte-array-to-string-transformer name="batsTransformer" ignoreBadInput="false" />

<tcp:endpoint host="localhost" port="5555" connector-ref="tcp_connector" name="tcp_reception">
<transformer ref="batsTransformer"/>
</tcp:endpoint>

<model name="EMAIL_MODEL">

<service name="EMAIL">
<inbound>
<tcp:inbound-endpoint ref="tcp_reception"/>
</inbound>
<outbound>
<pass-through-router>
<smtp:outbound-endpoint name="smtpEndpoint" host="s5700as52" port="25" >
<email:string-to-email-transformer/>
</smtp:outbound-endpoint>
</pass-through-router>
</outbound>
</service>
</model>
</mule>

If I put the from, to and subject for example in the smtp:outbound-endpoint, I don't have how to change it dinamically. The suggested test case that I am trying to use is:

import java.util.HashMap;
import java.util.Map;

import org.mule.DefaultMuleMessage;
import org.mule.module.client.MuleClient;
import org.mule.tck.FunctionalTestCase;
import org.mule.transport.email.MailProperties;

public class XPTOUnitTest extends FunctionalTestCase {

@Override
protected String getConfigResources() {
return "conf/mail-config.xml";
}

@SuppressWarnings("unchecked")
public void testReception() throws Exception{
MuleClient client = new MuleClient();
Map properties = new HashMap();
properties.put(MailProperties.TO_ADDRESSES_PROPERTY, "source@...");
properties.put(MailProperties.FROM_ADDRESS_PROPERTY, "target@...");
properties.put(MailProperties.SUBJECT_PROPERTY, "XPTO");
DefaultMuleMessage m = new DefaultMuleMessage("TEST");
m.addProperties(properties);
client.send("tcp://localhost:5555", m, 0);
}

}

I always get some errors that the socket connection is refused. When it works, it always have an timeout that doesn't let me debug the application (I already tried using -1, 0 or not passing the timeout value in the send method and nothing happens).

Any suggestions ? Am I using the MuleClient correctly ? Is there anything that I need to do in the xml ? Do I have to write an component to do this ?

Is there anything like the Dinamic Recipient List pattern in Mule that I can use to solve this problem ?

Thanks in advance.

Thor

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - User

[galaxy-dev] [2112] branches/product_cleanup/repository/server: Make repository work as separate module.

2009-12-16T17:20:49Z

[2112] branches/product_cleanup/repository/server: Make repository work as separate module.

Revision: 2112
Author: dandiep
Date: 2009-12-16 19:20:49 -0600 (Wed, 16 Dec 2009)

Log Message

Make repository work as separate module. Applications create a Galaxy instance which in turn takes a collection of Modules which it starts.

Modified Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/PageManager.java
branches/product_cleanup/repository/gwt-client/pom.xml
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java
branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml
branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml
branches/product_cleanup/web/src/main/webapp/index.jsp

Added Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/AdminApplication.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/GalaxyModule.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyService.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyServiceAsync.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/Repository.gwt.xml
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/Messages.properties
branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/GalaxyServiceImpl.java
branches/product_cleanup/web/src/main/webapp/images/ajax-loader.gif
branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/server/GalaxyServiceTest.java

Removed Paths

branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/

Property Changed

branches/product_cleanup/repository/gwt-client/
branches/product_cleanup/repository/server/

Diff

Added: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/AdminApplication.java (0 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/AdminApplication.java	                        (rev 0)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/AdminApplication.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,21 @@
+package org.mule.galaxy.web.client;
+
+import java.util.ArrayList;
+
+import com.google.gwt.core.client.EntryPoint;
+
+/**
+ * A simple application implementation which just loads the administration panel.
+ * Useful for simple testing only.
+ */
+public class AdminApplication implements EntryPoint {
+
+    public void onModuleLoad() {
+        Galaxy galaxy = new Galaxy();
+        
+        // no extra modules, so just start an empty Galaxy instance with just
+        // the admin panel.
+        galaxy.initialize(new ArrayList<GalaxyModule>());
+    }
+
+}
Property changes on: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/AdminApplication.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java (2111 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -54,7 +54,6 @@
 import com.extjs.gxt.ui.client.widget.layout.BorderLayout;
 import com.extjs.gxt.ui.client.widget.layout.BorderLayoutData;
 import com.extjs.gxt.ui.client.widget.layout.FlowLayout;
-import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -95,7 +94,7 @@
     private GalaxyServiceAsync galaxyService;
     private AdministrationPanel adminPanel;
 
-    public void initialize(List<GalaxyModule> modules) {
+    public void initialize(final List<GalaxyModule> modules) {
         //GXT.setDefaultTheme(Theme.GRAY, true);
         GXT.BLANK_IMAGE_URL = "extjsresources/images/default/s.gif";
         final String LOGO = "images/galaxy_logo_main_trans.gif";
@@ -140,17 +139,7 @@
             }
 
             public void onSuccess(ApplicationInfo appInfo) {
-                user = (WUser) appInfo.getUser();
-                // always the left most item
-                rightHeaderPanel.insert(new Label("Welcome, " + user.getName()), 0);
-                
-                extensions = (List) appInfo.getExtensions();
-                Collections.sort(extensions);
-                
-                plugins = appInfo.getPluginTabs();
-                userManagementSupported = appInfo.isUserManagementSupported();
-                loadTabs(Galaxy.this);
-                showFirstPage();
+                initializeApplication(appInfo, modules);
             }
         });
 
@@ -166,6 +155,24 @@
         Image.prefetch("images/lightbox.png");
     }
 
+    protected void initializeApplication(ApplicationInfo appInfo, final List<GalaxyModule> modules) {
+        user = (WUser) appInfo.getUser();
+        // always the left most item
+        rightHeaderPanel.insert(new Label("Welcome, " + user.getName()), 0);
+        
+        extensions = (List) appInfo.getExtensions();
+        Collections.sort(extensions);
+        
+        plugins = appInfo.getPluginTabs();
+        userManagementSupported = appInfo.isUserManagementSupported();
+        loadTabs(Galaxy.this);
+        
+        for (GalaxyModule module : modules) {
+            module.initialize(Galaxy.this);
+        }
+        showFirstPage();
+    }
+    
     private void createFooter() {
         ContentPanel southPanel = new ContentPanel();
         southPanel.setBorders(false);

Added: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/GalaxyModule.java (0 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/GalaxyModule.java	                        (rev 0)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/GalaxyModule.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,8 @@
+package org.mule.galaxy.web.client;
+
+/**
+ * A Module which adds capabilities to Galaxy's user interface.
+ */
+public interface GalaxyModule {
+    public void initialize(Galaxy galaxy);
+}
Property changes on: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/GalaxyModule.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/PageManager.java (2111 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/PageManager.java	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/PageManager.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -185,11 +185,15 @@
 
     public int createTab(String name, String token, String toolTip) {
         int index = tabPanel.getItemCount();
-        tabPanel.add(createEmptyTab(name, toolTip));
-        tabNames.add(index, token);
+        createTab(index, name, token, toolTip);
         return index;
     }
     
+    public void createTab(int index, String name, String token, String toolTip) {
+        tabPanel.insert(createEmptyTab(name, toolTip), index);
+        tabNames.add(index, token);
+    }
+    
     protected TabItem createEmptyTab(String name, String toolTip) {
         TabItem tab = new TabItem();
         TabItem.HeaderItem header = tab.getHeader();

Added: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyService.java (0 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyService.java	                        (rev 0)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyService.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,11 @@
+package org.mule.galaxy.web.rpc;
+
+import org.mule.galaxy.web.client.RPCException;
+
+import com.google.gwt.user.client.rpc.RemoteService;
+
+public interface GalaxyService extends RemoteService {
+
+    ApplicationInfo getApplicationInfo() throws RPCException;
+
+}
Property changes on: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyService.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyServiceAsync.java (0 => 2112)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyServiceAsync.java	                        (rev 0)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyServiceAsync.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,9 @@
+package org.mule.galaxy.web.rpc;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+
+public interface GalaxyServiceAsync {
+
+    void getApplicationInfo(AsyncCallback<ApplicationInfo> callback);
+
+}
Property changes on: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/rpc/GalaxyServiceAsync.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Property changes: branches/product_cleanup/repository/gwt-client

Name: svn:ignore
   - target
   + target
.settings
.classpath
.project

Modified: branches/product_cleanup/repository/gwt-client/pom.xml (2111 => 2112)

--- branches/product_cleanup/repository/gwt-client/pom.xml	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/repository/gwt-client/pom.xml	2009-12-17 01:20:49 UTC (rev 2112)
@@ -55,10 +55,10 @@
                         <version>2.0-beta6</version>
                         <configuration>
                             <gwtVersion>${gwtVersion}</gwtVersion>
-                            <runTarget>org.mule.galaxy.web.Galaxy/Galaxy.html</runTarget>
+                            <runTarget>org.mule.galaxy.repository.Repository/Repository.html</runTarget>
                             <style>OBF</style>
                             <compileTargets>
-                                <value>org.mule.galaxy.web.Galaxy</value>
+                                <value>org.mule.galaxy.repository.Repository</value>
                             </compileTargets>
                             <extraJvmArgs>-Xss1024k -Xmx1024m -Dgwt.nowarn.legacy.tools</extraJvmArgs>
                             <!--

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/Repository.gwt.xml (0 => 2112)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/Repository.gwt.xml	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/Repository.gwt.xml	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--<!DOCTYPE module PUBLIC "-//Google //DTD gwt-module-configuration XML V1.0//EN"-->
+            <!--"http://google-web-toolkit.googlecode.com/svn/tags/1.4.61/distro-source/core/src/gwt-module.dtd">-->
+        
+<module>
+
+    <inherits name='org.mule.galaxy.repository.RepositoryLib'/>
+    
+    <source path="rpc"/>
+    <source path="client"/>
+    
+    <entry-point class='org.mule.galaxy.repository.client.RepositoryApplication'/>
+
+</module>
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/Repository.gwt.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date Id
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml (2111 => 2112)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml	2009-12-17 01:20:49 UTC (rev 2112)
@@ -5,23 +5,10 @@
         
 <module>
 
-    <!-- Inherit the core Web Toolkit stuff.                  -->
     <inherits name='org.mule.galaxy.web.GalaxyLib'/>
     <inherits name="com.google.gwt.gen2.table.Table"/>
     
     <source path="rpc"/>
     <source path="client"/>
-
-    <public path="public">
-        <!--
-            Don't recursively include GWT compiler output when
-            developing with IDE and m2.
-        -->
-        <exclude name="org.mule.galaxy.web.Galaxy/**"/>
-        <exclude name="WEB-INF/**"/>
-        <exclude name="META-INF/**"/> 
-    </public>
-
-    <stylesheet src="application.css"/>
-
+    
 </module>

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java (2111 => 2112)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -1,5 +1,19 @@
 package org.mule.galaxy.repository.client;
 
-public class RepositoryApplication {
+import java.util.Arrays;
 
-}
+import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.web.client.GalaxyModule;
+
+import com.google.gwt.core.client.EntryPoint;
+
+public class RepositoryApplication implements EntryPoint {
+
+    public void onModuleLoad() {
+        Galaxy galaxy = new Galaxy();
+        
+        // Initialize Galaxy with the RepositoryModule
+        galaxy.initialize(Arrays.asList((GalaxyModule)new RepositoryModule()));
+    }
+
+}
\ No newline at end of file

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java (2111 => 2112)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -25,7 +25,7 @@
     private PropertyInterfaceManager propertyInterfaceManager = new PropertyInterfaceManager();
     private RepositoryConstants repositoryConstants;
     private RegistryServiceAsync registryService;
-    private int repositoryTabIndex;
+    private int repositoryTabIndex = 0;
     private boolean showTypeSystem = true;
     
     public void initialize(Galaxy galaxy) {
@@ -33,6 +33,8 @@
         this.repositoryConstants = (RepositoryConstants) GWT.create(RepositoryConstants.class);
 
         createService();
+        loadRepositoryTab();
+        addAdministrationMenuItems();
     }
 
     protected void addAdministrationMenuItems() {
@@ -86,7 +88,7 @@
     }
 
     protected void loadRepositoryTab() {
-        repositoryTabIndex = galaxy.getPageManager().createTab("Repository", "item", repositoryConstants.repo_TabTip());
+        galaxy.getPageManager().createTab(repositoryTabIndex, "Repository", "browse", repositoryConstants.repo_TabTip());
         createRepositoryPanels();
     }
 
@@ -120,6 +122,10 @@
     public void setShowTypeSystem(boolean showTypeSystem) {
         this.showTypeSystem = showTypeSystem;
     }
+
+    public void setRepositoryTab(int repositoryTabIndex) {
+        this.repositoryTabIndex = repositoryTabIndex;
+    }
     
 
 }

Property changes: branches/product_cleanup/repository/server

Name: svn:ignore
   + .settings
target
.classpath
.project

Added: branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/Messages.properties ( => )



Property changes on: branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/Messages.properties
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml (2111 => 2112)

--- branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml	2009-12-17 01:20:49 UTC (rev 2112)
@@ -12,7 +12,7 @@
 
     <bean id="coreGwtModule" class="org.mule.galaxy.web.GwtModule">
       <property name="core" value="true"/>
-      <property name="name" value="org.mule.galaxy.web.Repository"/>
+      <property name="name" value="org.mule.galaxy.repository.Repository"/>
       <property name="rpcServices">
         <map>
           <entry key="/galaxyService.rpc" value-ref="galaxyService" />

Added: branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/GalaxyServiceImpl.java (0 => 2112)

--- branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/GalaxyServiceImpl.java	                        (rev 0)
+++ branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/GalaxyServiceImpl.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,92 @@
+package org.mule.galaxy.web.server;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.mule.galaxy.Registry;
+import org.mule.galaxy.extension.Extension;
+import org.mule.galaxy.security.AccessControlManager;
+import org.mule.galaxy.security.Permission;
+import org.mule.galaxy.security.User;
+import org.mule.galaxy.security.UserManager;
+import org.mule.galaxy.util.SecurityUtils;
+import org.mule.galaxy.web.GwtFacet;
+import org.mule.galaxy.web.WebManager;
+import org.mule.galaxy.web.client.RPCException;
+import org.mule.galaxy.web.rpc.ApplicationInfo;
+import org.mule.galaxy.web.rpc.GalaxyService;
+import org.mule.galaxy.web.rpc.PluginTabInfo;
+import org.mule.galaxy.web.rpc.WExtensionInfo;
+import org.mule.galaxy.web.rpc.WUser;
+
+public class GalaxyServiceImpl implements GalaxyService {
+
+    private Registry registry;
+    private WebManager webManager;
+    private UserManager userManager;
+    private AccessControlManager accessControlManager;
+    
+    public ApplicationInfo getApplicationInfo() throws RPCException {
+        ApplicationInfo info = new ApplicationInfo();
+        info.setPluginTabs(getPluginTabs());
+        info.setUser(getUserInfo());
+        info.setUserManagementSupported(userManager.isManagementSupported());
+        info.setExtensions(getExtensions());
+        return info;
+    }
+
+    protected Collection<PluginTabInfo> getPluginTabs() {
+        Collection<GwtFacet> facets = webManager.getGwtFacets();
+        ArrayList<PluginTabInfo> wPlugins = new ArrayList<PluginTabInfo>();
+        for (GwtFacet p : facets) {
+            if (!p.getName().equals("core")) {
+                PluginTabInfo wp = new PluginTabInfo();
+                wp.setName(p.getName());
+                wp.setToken(p.getToken());
+                wPlugins.add(wp);
+            }
+        }
+        return wPlugins;
+    }
+
+    public List<WExtensionInfo> getExtensions() throws RPCException {
+        ArrayList<WExtensionInfo> exts = new ArrayList<WExtensionInfo>();
+        for (Extension e : registry.getExtensions()) {
+            exts.add(new WExtensionInfo(e.getId(), e.getName(), e.getPropertyDescriptorConfigurationKeys(), e.isMultivalueSupported()));
+        }
+        return exts;
+    }
+
+    public WUser getUserInfo() throws RPCException {
+        User user = SecurityUtils.getCurrentUser();
+        WUser w = SecurityServiceImpl.createWUser(user);
+
+        List<String> perms = new ArrayList<String>();
+
+        for (Permission p : accessControlManager.getGrantedPermissions(user)) {
+            perms.add(p.toString());
+        }
+        w.setPermissions(perms);
+
+        return w;
+    }
+
+    public void setWebManager(WebManager webManager) {
+        this.webManager = webManager;
+    }
+
+    public void setRegistry(Registry registry) {
+        this.registry = registry;
+    }
+
+    public void setUserManager(UserManager userManager) {
+        this.userManager = userManager;
+    }
+
+    public void setAccessControlManager(AccessControlManager accessControlManager) {
+        this.accessControlManager = accessControlManager;
+    }
+    
+
+}
Property changes on: branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/GalaxyServiceImpl.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml (2111 => 2112)

--- branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml	2009-12-17 01:20:49 UTC (rev 2112)
@@ -16,7 +16,7 @@
     
     <bean id="coreGwtModule" class="org.mule.galaxy.web.GwtModule">
       <property name="core" value="true"/>
-      <property name="name" value="org.mule.galaxy.web.Admin"/>
+      <property name="name" value="org.mule.galaxy.repository.Repository"/>
       <property name="rpcServices">
         <map>
           <entry key="/galaxyService.rpc" value-ref="galaxyService" />

Added: branches/product_cleanup/web/src/main/webapp/images/ajax-loader.gif

(Binary files differ)

Property changes on: branches/product_cleanup/web/src/main/webapp/images/ajax-loader.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + image/gif

Modified: branches/product_cleanup/web/src/main/webapp/index.jsp (2111 => 2112)

--- branches/product_cleanup/web/src/main/webapp/index.jsp	2009-12-16 23:18:07 UTC (rev 2111)
+++ branches/product_cleanup/web/src/main/webapp/index.jsp	2009-12-17 01:20:49 UTC (rev 2112)
@@ -132,7 +132,6 @@
     }
 %>
 
-<!-- OPTIONAL: include this if you want history support -->
 <iframe src="javascript:''" id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe>
 
 </body>

Added: branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/server/GalaxyServiceTest.java (0 => 2112)

--- branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/server/GalaxyServiceTest.java	                        (rev 0)
+++ branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/server/GalaxyServiceTest.java	2009-12-17 01:20:49 UTC (rev 2112)
@@ -0,0 +1,43 @@
+package org.mule.galaxy.web.server;
+
+import java.util.Collection;
+
+import org.mule.galaxy.test.AbstractGalaxyTest;
+import org.mule.galaxy.web.rpc.ApplicationInfo;
+import org.mule.galaxy.web.rpc.GalaxyService;
+import org.mule.galaxy.web.rpc.PluginTabInfo;
+import org.mule.galaxy.web.rpc.WUser;
+
+public class GalaxyServiceTest extends AbstractGalaxyTest {
+
+    protected GalaxyService galaxyService;
+    
+    @Override
+    protected String[] getConfigLocations() {
+        return new String[] { "/META-INF/applicationContext-core.xml", 
+                              "/META-INF/applicationContext-core-extensions.xml", 
+                              "/META-INF/applicationContext-acegi-security.xml",
+                              "/META-INF/applicationContext-web.xml",
+                              "/META-INF/applicationContext-test.xml" };
+        
+    }
+    
+    public void testGwtPlugins() throws Exception {
+        Collection<PluginTabInfo> plugins = galaxyService.getApplicationInfo().getPluginTabs();
+        assertEquals(0, plugins.size());
+    }
+
+    public void testApplicationInfo() throws Exception {
+        ApplicationInfo appInfo = galaxyService.getApplicationInfo();
+        WUser user = appInfo.getUser();
+        
+        assertNotNull(user.getUsername());
+        Collection<String> permissions = user.getPermissions();
+        assertTrue(permissions.size() > 0);
+        
+        assertTrue(permissions.contains("MANAGE_USERS"));
+
+        assertNotNull(appInfo.getExtensions());
+    }
+    
+}
Property changes on: branches/product_cleanup/web/src/test/java/org/mule/galaxy/web/server/GalaxyServiceTest.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

--------------------------------------------------------------------- To unsubscribe from this list, please visit: http://admin.muleforge.org/manage_email

You received this message because you are subscribed to the Google Groups "MuleForge Dev" group.
To post to this group, send email to muleforgedev@....
To unsubscribe from this group, send email to muleforgedev+unsubscribe@....
For more options, visit this group at http://groups.google.com/group/muleforgedev?hl=en.

From forum: MuleForge Dev

[mule-scm] [mule] [16274] branches/mule-2.2.x/transports/cxf/src/test/java/org/mule/transport/cxf/ProxyTestCase.java: fix and comment out test for MULE-4584 / EE-1711 until the issue is fixed; re-enable accidentally disabled tests

2009-12-16T17:20:39Z

[mule] [16274] branches/mule-2.2.x/transports/cxf/src/test/java/org/mule/transport/cxf/ProxyTestCase.java: fix and comment out test for MULE-4584 / EE-1711 until the issue is fixed; re-enable accidentally disabled tests

Revision: 16274
Author: dzapata
Date: 2009-12-16 19:20:38 -0600 (Wed, 16 Dec 2009)

Log Message

fix and comment out test for MULE-4584 / EE-1711 until the issue is fixed; re-enable accidentally disabled tests

Modified Paths

branches/mule-2.2.x/transports/cxf/src/test/java/org/mule/transport/cxf/ProxyTestCase.java

Diff

Modified: branches/mule-2.2.x/transports/cxf/src/test/java/org/mule/transport/cxf/ProxyTestCase.java (16273 => 16274)

--- branches/mule-2.2.x/transports/cxf/src/test/java/org/mule/transport/cxf/ProxyTestCase.java	2009-12-16 17:11:03 UTC (rev 16273)
+++ branches/mule-2.2.x/transports/cxf/src/test/java/org/mule/transport/cxf/ProxyTestCase.java	2009-12-17 01:20:38 UTC (rev 16274)
@@ -31,265 +31,260 @@
     String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
                  + "<soap:Body><test xmlns=\"http://foo\"> foo </test>" + "</soap:Body>" + "</soap:Envelope>";
 
-    String doGoogleSearch = "<urn:doGoogleSearch xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:urn=\"urn:GoogleSearch\">";
-    
+    String doGoogleSearch = "<urn:doGoogleSearch xmlns:urn=\"urn:GoogleSearch\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">";
+
     String msgWithComment = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-        + "<!-- comment 1 -->"
-        + "<soap:Header>"
-        + "<!-- comment 2 -->"
-        + "</soap:Header>"
-        + "<!-- comment 3 -->"
-        + "<soap:Body>"
-        + "<!-- comment 4 -->"
-        + doGoogleSearch
-        + "<!-- this comment breaks it -->"
-        + "<key>1</key>"
-        + "<!-- comment 5 -->"
-        + "<q>a</q>"
-        + "<start>0</start>"
-        + "<maxResults>1</maxResults>"
-        + "<filter>false</filter>"
-        + "<restrict>a</restrict>"
-        + "<safeSearch>true</safeSearch>"
-        + "<lr>a</lr>"
-        + "<ie>b</ie>"
-        + "<oe>c</oe>"
-        + "</urn:doGoogleSearch>"
-        + "<!-- comment 6 -->"
-        + "</soap:Body>"
-        + "<!-- comment 7 -->"
-        + "</soap:Envelope>";
-    
-//    public void testServerWithEcho() throws Exception
-//    {
-//        MuleClient client = new MuleClient();
-//        MuleMessage result = client.send("http://localhost:63081/services/Echo", msg, null);
-//        String resString = result.getPayloadAsString();
-//        assertTrue(resString.indexOf("<test xmlns=\"http://foo\"> foo </test>") != -1);
-//    }
-//
-//    public void testServerClientProxy() throws Exception
-//    {
-//        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-//                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
-//
-//        MuleClient client = new MuleClient();
-//        MuleMessage result = client.send("http://localhost:63081/services/proxy", msg, null);
-//        String resString = result.getPayloadAsString();
-//        System.out.println(resString);
-//        assertTrue(resString.indexOf("<test xmlns=\"http://foo\"") != -1);
-//    }
-//
-//    public void testProxyStreamClsoing() throws Exception
-//    {
-//        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-//                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
-//
-//        MuleClient client = new MuleClient();
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MuleMessage result = client.send("http://localhost:63081/services/envelope-proxy", msg, null);
-//
-//            String resString = result.getPayloadAsString();
-//            assertTrue(resString.indexOf("<test xmlns=\"http://foo\"") != -1);
-//        }
-//
-//        for (int i = 0; i < 20; i++)
-//        {
-//            MuleMessage result = client.send("http://localhost:63081/services/proxy", msg, null);
-//
-//            String resString = result.getPayloadAsString();
-//            assertTrue(resString.indexOf("<test xmlns=\"http://foo\"") != -1);
-//        }
-//    }
-//
-//    public void testServerClientProxyWithWsdl() throws Exception
-//    {
-//        final Latch latch = new Latch();
-//        ((FunctionalTestComponent) getComponent("serverClientProxyWithWsdl")).setEventCallback(new EventCallback()
-//        {
-//
-//            public void eventReceived(MuleEventContext context, Object component) throws Exception
-//            {
-//                latch.countDown();
-//            }
-//        });
-//
-//        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-//                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
-//
-//        MuleClient client = new MuleClient();
-//        MuleMessage result = client.send("http://localhost:63081/services/proxyWithWsdl", msg, null);
-//        String resString = result.getPayloadAsString();
-//        assertTrue(latch.await(1000, TimeUnit.MILLISECONDS));
-//        assertTrue(resString.indexOf("<test xmlns=\"http://foo\"") != -1);
-//    }
-//
-//    public void testServerClientProxyWithWsdl2() throws Exception
-//    {
-//        final Latch latch = new Latch();
-//        ((FunctionalTestComponent) getComponent("serverClientProxyWithWsdl2")).setEventCallback(new EventCallback()
-//        {
-//
-//            public void eventReceived(MuleEventContext context, Object component) throws Exception
-//            {
-//                latch.countDown();
-//            }
-//        });
-//
-//        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-//                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
-//
-//        MuleClient client = new MuleClient();
-//        MuleMessage result = client.send("http://localhost:63081/services/proxyWithWsdl2", msg, null);
-//        String resString = result.getPayloadAsString();
-//        assertTrue(latch.await(1000, TimeUnit.MILLISECONDS));
-//        assertTrue(resString.indexOf("<test xmlns=\"http://foo\"") != -1);
-//    }
-//
-//    public void testServerClientProxyWithTransform() throws Exception
-//    {
-//        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-//                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
-//
-//        MuleClient client = new MuleClient();
-//        MuleMessage result = client.send("http://localhost:63081/services/proxyWithTransform", msg, null);
-//        String resString = result.getPayloadAsString();
-//        System.out.println(resString);
-//        assertTrue(resString.indexOf("<transformed xmlns=\"http://foo\">") != -1);
-//    }
-//
-//    public void testProxyWithDatabinding() throws Exception
-//    {
-//        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-//                     + "<soap:Body><greetMe xmlns=\"http://apache.org/hello_world_soap_http/types\"><requestType>Dan</requestType></greetMe>"
-//                     + "</soap:Body>" + "</soap:Envelope>";
-//
-//        MuleClient client = new MuleClient();
-//        MuleMessage result = client.send("http://localhost:63081/services/greeter-databinding-proxy", msg,
-//            null);
-//        String resString = result.getPayloadAsString();
-//        assertTrue(resString.indexOf("greetMeResponse") != -1);
-//    }
+                            + "<!-- comment 1 -->" + "<soap:Header>" + "<!-- comment 2 -->"
+                            + "</soap:Header>" + "<!-- comment 3 -->" + "<soap:Body>" + "<!-- comment 4 -->"
+                            + doGoogleSearch + "<!-- this comment breaks it -->" + "<key>1</key>"
+                            + "<!-- comment 5 -->" + "<q>a</q>" + "<start>0</start>"
+                            + "<maxResults>1</maxResults>" + "<filter>false</filter>"
+                            + "<restrict>a</restrict>" + "<safeSearch>true</safeSearch>" + "<lr>a</lr>"
+                            + "<ie>b</ie>" + "<oe>c</oe>" + "</urn:doGoogleSearch>" + "<!-- comment 6 -->"
+                            + "</soap:Body>" + "<!-- comment 7 -->" + "</soap:Envelope>";
 
-    public void testProxyWithFault() throws Exception
+    public void testServerWithEcho() throws Exception
     {
+        MuleClient client = new MuleClient();
+        MuleMessage result = client.send("http://localhost:63081/services/Echo", msg, null);
+        String resString = result.getPayloadAsString();
+        assertTrue(resString.indexOf("<test xmlns=\"http://foo\"> foo </test>") != -1);
+    }
+
+    public void testServerClientProxy() throws Exception
+    {
         String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-                     + "<soap:Body><invalid xmlns=\"http://apache.org/hello_world_soap_http/types\"><requestType>Dan</requestType></invalid>"
+                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
+
+        MuleClient client = new MuleClient();
+        MuleMessage result = client.send("http://localhost:63081/services/proxy", msg, null);
+        String resString = result.getPayloadAsString();
+        System.out.println(resString);
+        assertTrue(resString.indexOf("<test xmlns=\"http://foo\"") != -1);
+    }
+
+    public void testProxyStreamClsoing() throws Exception
+    {
+        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
+
+        MuleClient client = new MuleClient();
+        for (int i = 0; i < 20; i++)
+        {
+            MuleMessage result = client.send("http://localhost:63081/services/envelope-proxy", msg, null);
+
+            String resString = result.getPayloadAsString();
+            assertTrue(resString.indexOf("<test xmlns=\"http://foo\"") != -1);
+        }
+
+        for (int i = 0; i < 20; i++)
+        {
+            MuleMessage result = client.send("http://localhost:63081/services/proxy", msg, null);
+
+            String resString = result.getPayloadAsString();
+            assertTrue(resString.indexOf("<test xmlns=\"http://foo\"") != -1);
+        }
+    }
+
+    public void testServerClientProxyWithWsdl() throws Exception
+    {
+        final Latch latch = new Latch();
+        ((FunctionalTestComponent) getComponent("serverClientProxyWithWsdl")).setEventCallback(new EventCallback()
+        {
+
+            public void eventReceived(MuleEventContext context, Object component) throws Exception
+            {
+                latch.countDown();
+            }
+        });
+
+        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
+
+        MuleClient client = new MuleClient();
+        MuleMessage result = client.send("http://localhost:63081/services/proxyWithWsdl", msg, null);
+        String resString = result.getPayloadAsString();
+        assertTrue(latch.await(1000, TimeUnit.MILLISECONDS));
+        assertTrue(resString.indexOf("<test xmlns=\"http://foo\"") != -1);
+    }
+
+    public void testServerClientProxyWithWsdl2() throws Exception
+    {
+        final Latch latch = new Latch();
+        ((FunctionalTestComponent) getComponent("serverClientProxyWithWsdl2")).setEventCallback(new EventCallback()
+        {
+
+            public void eventReceived(MuleEventContext context, Object component) throws Exception
+            {
+                latch.countDown();
+            }
+        });
+
+        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
+
+        MuleClient client = new MuleClient();
+        MuleMessage result = client.send("http://localhost:63081/services/proxyWithWsdl2", msg, null);
+        String resString = result.getPayloadAsString();
+        assertTrue(latch.await(1000, TimeUnit.MILLISECONDS));
+        assertTrue(resString.indexOf("<test xmlns=\"http://foo\"") != -1);
+    }
+
+    public void testServerClientProxyWithTransform() throws Exception
+    {
+        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
+
+        MuleClient client = new MuleClient();
+        MuleMessage result = client.send("http://localhost:63081/services/proxyWithTransform", msg, null);
+        String resString = result.getPayloadAsString();
+        System.out.println(resString);
+        assertTrue(resString.indexOf("<transformed xmlns=\"http://foo\">") != -1);
+    }
+
+    public void testProxyWithDatabinding() throws Exception
+    {
+        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+                     + "<soap:Body><greetMe xmlns=\"http://apache.org/hello_world_soap_http/types\"><requestType>Dan</requestType></greetMe>"
                      + "</soap:Body>" + "</soap:Envelope>";
 
         MuleClient client = new MuleClient();
-        MuleMessage result = client.send("http://localhost:63081/services/greeter-proxy", msg, null);
+        MuleMessage result = client.send("http://localhost:63081/services/greeter-databinding-proxy", msg,
+            null);
         String resString = result.getPayloadAsString();
+        assertTrue(resString.indexOf("greetMeResponse") != -1);
+    }
 
-        assertFalse("Status code should not be 'OK' when the proxied endpoint returns a fault",
-            !result.getProperty("http.status").equals(HttpConstants.SC_OK));
-        assertTrue(resString.indexOf("invalid was not recognized") != -1);
+    /**
+     * Test for MULE-4584 / EE-1711, commented out until we resolve the issue
+     * 
+     * @throws Exception
+     */
+    // public void testProxyWithFault() throws Exception
+    // {
+    // String msg =
+    // "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+    // +
+    // "<soap:Body><invalid xmlns=\"http://apache.org/hello_world_soap_http/types\"><requestType>Dan</requestType></invalid>"
+    // + "</soap:Body>" + "</soap:Envelope>";
+    //
+    // MuleClient client = new MuleClient();
+    // MuleMessage result =
+    // client.send("http://localhost:63081/services/greeter-proxy", msg, null);
+    // String resString = result.getPayloadAsString();
+    //
+    // String resultProperty = (String)result.getProperty("http.status");
+    //                       
+    // assertFalse("Status code should not be 'OK' when the proxied endpoint returns a fault",
+    // Integer.parseInt(resultProperty) == (HttpConstants.SC_OK));
+    // assertTrue(resString.indexOf("invalid was not recognized") != -1);
+    // }
+
+    public void testProxyWithIntermediateTransform() throws Exception
+    {
+        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+                     + "<soap:Body><greetMe xmlns=\"http://apache.org/hello_world_soap_http/types\"><requestType>Dan</requestType></greetMe>"
+                     + "</soap:Body>" + "</soap:Envelope>";
+
+        MuleClient client = new MuleClient();
+        MuleMessage result = client.send("http://localhost:63081/services/transform-proxy", msg, null);
+        String resString = result.getPayloadAsString();
+        assertTrue(resString.indexOf("greetMeResponse") != -1);
     }
 
-//    public void testProxyWithIntermediateTransform() throws Exception
-//    {
-//        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-//                     + "<soap:Body><greetMe xmlns=\"http://apache.org/hello_world_soap_http/types\"><requestType>Dan</requestType></greetMe>"
-//                     + "</soap:Body>" + "</soap:Envelope>";
-//
-//        MuleClient client = new MuleClient();
-//        MuleMessage result = client.send("http://localhost:63081/services/transform-proxy", msg, null);
-//        String resString = result.getPayloadAsString();
-//        assertTrue(resString.indexOf("greetMeResponse") != -1);
-//    }
-//
-//    public void testSoapActionRouting() throws Exception
-//    {
-//        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
-//                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
-//
-//        Map<String, Object> httpHeaders = new HashMap<String, Object>();
-//
-//        Map<String, Object> props = new HashMap<String, Object>();
-//        props.put(HttpConnector.HTTP_CUSTOM_HEADERS_MAP_PROPERTY, httpHeaders);
-//        props.put("SOAPAction", "http://acme.com/transform");
-//
-//        MuleClient client = new MuleClient();
-//        MuleMessage result = client.send("http://localhost:63081/services/routeBasedOnSoapAction", msg, props);
-//        String resString = result.getPayloadAsString();
-//        System.out.println(resString);
-//        assertTrue(resString.indexOf("<transformed xmlns=\"http://foo\">") != -1);
-//    }
-//
-//    public void testOneWaySend() throws Exception
-//    {
-//        MuleClient client = new MuleClient();
-//        MuleMessage result = client.send("http://localhost:63081/services/routeBasedOnSoapAction",
-//            prepareOneWayTestMessage(), prepareOneWayTestProperties());
-//        assertEquals("", result.getPayloadAsString());
-//        int status = result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, -1);
-//        assertEquals(HttpConstants.SC_OK, status);
-//
-//        AsyncService component = (AsyncService) getComponent("asyncService");
-//        assertTrue(component.getLatch().await(10000, TimeUnit.MILLISECONDS));
-//    }
-//
-//    public void testOneWayDispatch() throws Exception
-//    {
-//        new MuleClient().dispatch("http://localhost:63081/services/routeBasedOnSoapAction",
-//            prepareOneWayTestMessage(), prepareOneWayTestProperties());
-//
-//        AsyncService component = (AsyncService) getComponent("asyncService");
-//        assertTrue(component.getLatch().await(10000, TimeUnit.MILLISECONDS));
-//    }
-//
-//    public void testOneWaySendAsyncEndpoint() throws Exception
-//    {
-//        MuleClient client = new MuleClient();
-//        MuleMessage result = client.send("http://localhost:63081/services/routeBasedOnSoapActionAsync",
-//            prepareOneWayTestMessage(), prepareOneWayTestProperties());
-//        assertEquals("", result.getPayloadAsString());
-//
-//        AsyncService component = (AsyncService) getComponent("asyncService");
-//        assertTrue(component.getLatch().await(10000, TimeUnit.MILLISECONDS));
-//        int status = result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, -1);
-//        assertEquals(HttpConstants.SC_OK, status);
-//    }
-//
-//    public void testOneWayDispatchAsyncEndpoint() throws Exception
-//    {
-//        new MuleClient().dispatch("http://localhost:63081/services/routeBasedOnSoapActionAsync",
-//            prepareOneWayTestMessage(), prepareOneWayTestProperties());
-//
-//        AsyncService component = (AsyncService) getComponent("asyncService");
-//        assertTrue(component.getLatch().await(10000, TimeUnit.MILLISECONDS));
-//    }
-//
-//    /**
-//     * MULE-4549 ReversibleXMLStreamReader chokes on comments with ClassCastException
-//     * @throws Exception
-//     */
-//    public void testProxyWithCommentInRequest() throws Exception
-//    {
-//        MuleClient client = new MuleClient();
-//        MuleMessage result = client.send("http://localhost:63081/services/envelope-proxy", msgWithComment, null);
-//        String resString = result.getPayloadAsString();
-//        assertTrue(resString.contains(doGoogleSearch));
-//    }
-//    
-//    protected String prepareOneWayTestMessage()
-//    {
-//        return "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + "<soap:Body>"
-//               + "<send xmlns=\"http://testmodels.cxf.transport.mule.org\"><text>hello</text></send>"
-//               + "</soap:Body>" + "</soap:Envelope>";
-//    }
-//
-//    protected Map prepareOneWayTestProperties()
-//    {
-//        Map<String, Object> httpHeaders = new HashMap<String, Object>();
-//
-//        Map<String, Object> props = new HashMap<String, Object>();
-//        props.put(HttpConnector.HTTP_CUSTOM_HEADERS_MAP_PROPERTY, httpHeaders);
-//        props.put("SOAPAction", "http://acme.com/oneway");
-//        return props;
-//    }
+    public void testSoapActionRouting() throws Exception
+    {
+        String msg = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+                     + "<soap:Body> <test xmlns=\"http://foo\"></test>" + "</soap:Body>" + "</soap:Envelope>";
 
+        Map<String, Object> httpHeaders = new HashMap<String, Object>();
+
+        Map<String, Object> props = new HashMap<String, Object>();
+        props.put(HttpConnector.HTTP_CUSTOM_HEADERS_MAP_PROPERTY, httpHeaders);
+        props.put("SOAPAction", "http://acme.com/transform");
+
+        MuleClient client = new MuleClient();
+        MuleMessage result = client.send("http://localhost:63081/services/routeBasedOnSoapAction", msg, props);
+        String resString = result.getPayloadAsString();
+        System.out.println(resString);
+        assertTrue(resString.indexOf("<transformed xmlns=\"http://foo\">") != -1);
+    }
+
+    public void testOneWaySend() throws Exception
+    {
+        MuleClient client = new MuleClient();
+        MuleMessage result = client.send("http://localhost:63081/services/routeBasedOnSoapAction",
+            prepareOneWayTestMessage(), prepareOneWayTestProperties());
+        assertEquals("", result.getPayloadAsString());
+        int status = result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, -1);
+        assertEquals(HttpConstants.SC_OK, status);
+
+        AsyncService component = (AsyncService) getComponent("asyncService");
+        assertTrue(component.getLatch().await(10000, TimeUnit.MILLISECONDS));
+    }
+
+    public void testOneWayDispatch() throws Exception
+    {
+        new MuleClient().dispatch("http://localhost:63081/services/routeBasedOnSoapAction",
+            prepareOneWayTestMessage(), prepareOneWayTestProperties());
+
+        AsyncService component = (AsyncService) getComponent("asyncService");
+        assertTrue(component.getLatch().await(10000, TimeUnit.MILLISECONDS));
+    }
+
+    public void testOneWaySendAsyncEndpoint() throws Exception
+    {
+        MuleClient client = new MuleClient();
+        MuleMessage result = client.send("http://localhost:63081/services/routeBasedOnSoapActionAsync",
+            prepareOneWayTestMessage(), prepareOneWayTestProperties());
+        assertEquals("", result.getPayloadAsString());
+
+        AsyncService component = (AsyncService) getComponent("asyncService");
+        assertTrue(component.getLatch().await(10000, TimeUnit.MILLISECONDS));
+        int status = result.getIntProperty(HttpConnector.HTTP_STATUS_PROPERTY, -1);
+        assertEquals(HttpConstants.SC_OK, status);
+    }
+
+    public void testOneWayDispatchAsyncEndpoint() throws Exception
+    {
+        new MuleClient().dispatch("http://localhost:63081/services/routeBasedOnSoapActionAsync",
+            prepareOneWayTestMessage(), prepareOneWayTestProperties());
+
+        AsyncService component = (AsyncService) getComponent("asyncService");
+        assertTrue(component.getLatch().await(10000, TimeUnit.MILLISECONDS));
+    }
+
+    /**
+     * MULE-4549 ReversibleXMLStreamReader chokes on comments with ClassCastException
+     * 
+     * @throws Exception
+     */
+    public void testProxyWithCommentInRequest() throws Exception
+    {
+        MuleClient client = new MuleClient();
+        MuleMessage result = client.send("http://localhost:63081/services/envelope-proxy", msgWithComment,
+            null);
+        String resString = result.getPayloadAsString();
+        assertTrue(resString.contains(doGoogleSearch));
+    }
+
+    protected String prepareOneWayTestMessage()
+    {
+        return "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">" + "<soap:Body>"
+               + "<send xmlns=\"http://testmodels.cxf.transport.mule.org\"><text>hello</text></send>"
+               + "</soap:Body>" + "</soap:Envelope>";
+    }
+
+    protected Map prepareOneWayTestProperties()
+    {
+        Map<String, Object> httpHeaders = new HashMap<String, Object>();
+
+        Map<String, Object> props = new HashMap<String, Object>();
+        props.put(HttpConnector.HTTP_CUSTOM_HEADERS_MAP_PROPERTY, httpHeaders);
+        props.put("SOAPAction", "http://acme.com/oneway");
+        return props;
+    }
+
     protected String getConfigResources()
     {
         return "proxy-conf.xml";

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule Commits

Re: Component Binding - Mature ?

2009-12-16T17:07:00Z

How about http://www.mulesoft.org/display/MULE2USER/Using+Expressions ?

HTH,
Andrew

On Wed, Dec 16, 2009 at 5:39 PM, mbcw <mule.user.relay@...> wrote:

Does it not seem that component binding is a little cumbersome in that it requires a java class and realization, vs. just configuration? Content enrichment is a basic EAI pattern.

Imagine a case of a msg containing employee ID. Msg is enriched with employee name, via db lookup. Component binding seems to be the way recommended.

Am I missing something?

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - User

[galaxy-dev] [2111] branches/product_cleanup/web: Checkpoint.

2009-12-16T15:18:07Z

[2111] branches/product_cleanup/web: Checkpoint.

Revision: 2111
Author: dandiep
Date: 2009-12-16 17:18:07 -0600 (Wed, 16 Dec 2009)

Log Message

Checkpoint. Repository now compiles as it's own separate module. Nearly working as a standalone drop in to the web module.

Modified Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/GalaxyLib.gwt.xml
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/AdministrationPanel.java
branches/product_cleanup/integration/atom-client/src/test/java/org/mule/galaxy/atom/client/AtomGwtTest.java
branches/product_cleanup/repository/gwt-client/pom.xml
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/ActivityPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/DateParseException.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/InnerPropertyDescriptorForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleListPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PolicyPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorListPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeListPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/AbstractBrowsePanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/ArtifactListPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/BulkEditPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/PolicyResultsPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddArtifactForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddItemForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddWorkspaceForm.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ChildItemsPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemInfoPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemRolePermissionPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/NameEditPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/PolicyResultsPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/RepositoryMenuPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractListRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractPropertyRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/ArtifactRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EditPropertyPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EntryMetadataPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LifecycleRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LinksRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/MapRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/NewPropertyPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/PropertyInterfaceManager.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleListRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/UserListRenderer.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/AddItemHelper.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/ItemPathOracle.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/LifecycleSelectionPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PolicySelectionPanel.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PropertyDescriptorComparator.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/RegistryOracle.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/WTypeComparator.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/ItemInfo.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryService.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryServiceAsync.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WApprovalMessage.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactType.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactView.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WComment.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WGovernanceInfo.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WIndex.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLifecycle.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLinks.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPhase.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicy.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicyException.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WProperty.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPropertyDescriptor.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WSearchResults.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WType.java
branches/product_cleanup/repository/server/pom.xml
branches/product_cleanup/repository/server/src/test/java/org/mule/galaxy/web/server/RegistryServiceTest.java
branches/product_cleanup/web/pom.xml
branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml

Added Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Admin.gwt.xml
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryConstants.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryMessages.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/StylizedSortableGrid.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/RegistryServiceImpl.java
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathResolver.java
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java
branches/product_cleanup/repository/server/src/main/resources/META-INF/
branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml

Removed Paths

branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Galaxy.gwt.xml
branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/StylizedSortableGrid.java
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/activity/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/ui/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/
branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/
branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/server/
branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java
branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/ContextPathResolver.java

Diff

Copied: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Admin.gwt.xml (from rev 2109, branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Galaxy.gwt.xml) (0 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Admin.gwt.xml	                        (rev 0)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Admin.gwt.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--<!DOCTYPE module PUBLIC "-//Google //DTD gwt-module-configuration XML V1.0//EN"-->
+            <!--"http://google-web-toolkit.googlecode.com/svn/tags/1.4.61/distro-source/core/src/gwt-module.dtd">-->
+        
+<module>
+    <inherits name='org.mule.galaxy.web.GalaxyLib'/>
+    
+    <entry-point class='org.mule.galaxy.web.client.AdminApplication'/>
+</module>

Deleted: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Galaxy.gwt.xml (2110 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Galaxy.gwt.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/Galaxy.gwt.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--<!DOCTYPE module PUBLIC "-//Google //DTD gwt-module-configuration XML V1.0//EN"-->
-            <!--"http://google-web-toolkit.googlecode.com/svn/tags/1.4.61/distro-source/core/src/gwt-module.dtd">-->
-        
-<module>
-    <inherits name='org.mule.galaxy.web.GalaxyLib'/>
-    <inherits name="com.google.gwt.gen2.table.Table"/>
-    
-    <entry-point class='org.mule.galaxy.web.client.Galaxy'/>
-</module>

Modified: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/GalaxyLib.gwt.xml (2110 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/GalaxyLib.gwt.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/GalaxyLib.gwt.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -7,11 +7,10 @@
 
     <!-- Inherit the core Web Toolkit stuff.                  -->
     <inherits name='com.google.gwt.user.User'/>
-    <inherits name='com.google.gwt.widgetideas.DatePicker' />
+    <inherits name='com.google.gwt.widgetideas.GlassPanel' />
     <inherits name='com.extjs.gxt.ui.GXT'/>
     <inherits name='com.google.gwt.i18n.I18N'/>
     
-
     <source path="rpc"/>
     <source path="client"/>

Modified: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java (2110 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/Galaxy.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -70,7 +70,7 @@
 /**
  * Entry point classes define <code>onModuleLoad()</code>.
  */
-public class Galaxy implements EntryPoint {
+public class Galaxy {
 
     private SecurityServiceAsync securityService;
     private HeartbeatServiceAsync heartbeatService;
@@ -93,11 +93,9 @@
     private PageManager pageManager;
     private ContentPanel centerPanel;
     private GalaxyServiceAsync galaxyService;
+    private AdministrationPanel adminPanel;
 
-    /**
-     * This is the entry point method.
-     */
-    public void onModuleLoad() {
+    public void initialize(List<GalaxyModule> modules) {
         //GXT.setDefaultTheme(Theme.GRAY, true);
         GXT.BLANK_IMAGE_URL = "extjsresources/images/default/s.gif";
         final String LOGO = "images/galaxy_logo_main_trans.gif";
@@ -284,11 +282,15 @@
     protected void loadAdminTab() {
         if (showAdminTab(user)) {
             adminTabIndex = pageManager.createTab("Administration", "admin", administrationConstants.admin_TabTip());
-            AdministrationPanel adminPanel = createAdministrationPanel();
+            adminPanel = createAdministrationPanel();
             pageManager.createPageInfo("admin", adminPanel, adminTabIndex);
         }
     }
 
+    public AdministrationPanel getAministrationPanel() {
+        return adminPanel;
+    }
+
     protected void loadPluginTabs() {
         for (PluginTabInfo plugin : getPlugins()) {
             int index = pageManager.createTab(plugin.getName(), plugin.getRootToken(), "");

Modified: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/AdministrationPanel.java (2110 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/AdministrationPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/AdministrationPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -252,5 +252,15 @@
         this.utilityItems = utilityItems;
     }
 
+    public void addUtilityMenuItem(NavMenuItem navMenuItem) {
+        // TODO Auto-generated method stub
+        
+    }
 
+    public void addManageMenuItem(NavMenuItem item) {
+        // TODO Auto-generated method stub
+        
+    }
+
+
 }

Deleted: branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/StylizedSortableGrid.java (2110 => 2111)

--- branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/StylizedSortableGrid.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/StylizedSortableGrid.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,162 +0,0 @@
-package org.mule.galaxy.web.client.util;
-
-import com.google.gwt.gen2.table.client.SortableGrid;
-import com.google.gwt.gen2.table.client.TableModelHelper.ColumnSortList;
-import com.google.gwt.gen2.table.event.client.RowHighlightEvent;
-import com.google.gwt.gen2.table.event.client.RowHighlightHandler;
-import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
-import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
-import com.google.gwt.gen2.table.event.client.RowUnhighlightEvent;
-import com.google.gwt.gen2.table.event.client.RowUnhighlightHandler;
-import com.google.gwt.gen2.table.event.client.TableEvent.Row;
-import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Element;
-
-public class StylizedSortableGrid extends SortableGrid {
-
-    public StylizedSortableGrid(int rows, int columns) {
-        super(rows, columns);
-
-        setCellSpacing(0);
-        setCellPadding(4);
-
-        addRowHighlightHandler(new RowHighlightHandler() {
-            public void onRowHighlight(RowHighlightEvent event) {
-                int idx = event.getValue().getRowIndex();
-                if (idx == 0)
-                    return;
-                getRowFormatter().setStyleName(idx, "SortableGrid-selectedRow");
-            }
-        });
-        addRowUnhighlightHandler(new RowUnhighlightHandler() {
-            public void onRowUnhighlight(RowUnhighlightEvent event) {
-                int idx = event.getValue().getRowIndex();
-                if (idx == 0 || getSelectedRows().contains(idx))
-                    return;
-
-                getRowFormatter().setStyleName(idx, "");
-            }
-        });
-        addRowSelectionHandler(new RowSelectionHandler() {
-
-            public void onRowSelection(RowSelectionEvent event) {
-                for (Row row : event.getDeselectedRows()) {
-                    int idx = row.getRowIndex();
-                    if (idx == 0)
-                        return;
-
-                    getRowFormatter().setStyleName(idx, "");
-                }
-
-                for (Row row : event.getSelectedRows()) {
-                    int idx = row.getRowIndex();
-                    if (idx == 0)
-                        return;
-
-                    getRowFormatter().setStyleName(idx, "SortableGrid-selectedRow");
-                }
-            }
-        });
-
-        setColumnSorter(new ColumnSorter() {
-
-            @Override
-            public void onSortColumn(SortableGrid grid, ColumnSortList sortList,
-                                     SortableGrid.ColumnSorterCallback callback) {
-                // Get the primary column and sort order
-                int column = sortList.getPrimaryColumn();
-                boolean ascending = sortList.isPrimaryAscending();
-
-                // Apply the default quicksort algorithm
-                SelectionGridCellFormatter formatter = grid.getSelectionGridCellFormatter();
-                Element[] tdElems = new Element[grid.getRowCount()];
-                for (int i = 0; i < tdElems.length; i++) {
-                    tdElems[i] = formatter.getElement(i, column);
-                }
-                
-                Element[] nonHeaders = new Element[tdElems.length-1];
-                
-                for (int i = 1; i < tdElems.length; i++) {
-                    nonHeaders[i-1] = tdElems[i];
-                }
-                
-                quicksort(nonHeaders, 0, nonHeaders.length - 1);
-
-                for (int i = 1; i < tdElems.length; i++) {
-                    tdElems[i] = nonHeaders[i-1];
-                }
-                
-                // Convert tdElems to trElems, reversing if needed
-                Element[] trElems = new Element[tdElems.length];
-                trElems[0] = DOM.getParent(tdElems[0]);
-                if (ascending) {
-                    for (int i = 1; i < tdElems.length; i++) {
-                        trElems[i] = DOM.getParent(tdElems[i]);
-                    }
-                } else {
-                    int maxElem = tdElems.length - 1;
-                    for (int i = 1; i <= maxElem; i++) {
-                        trElems[i] = DOM.getParent(tdElems[maxElem - i + 1]);
-                    }
-                }
-
-                // Use the callback to complete the sorting
-                callback.onSortingComplete(trElems);
-            }
-
-            /**
-             * Recursive quicksort algorithm.
-             * 
-             * @param tdElems
-             *            an array of row elements
-             * @param start
-             *            the start index to sort
-             * @param end
-             *            the last index to sort
-             */
-            private void quicksort(Element[] tdElems, int start, int end) {
-                // No need to sort
-                if (start >= end) {
-                    return;
-                }
-
-                // Sort this set
-                int i = start + 1;
-                int k = end;
-                String pivot = DOM.getInnerText(tdElems[start]);
-                while (k >= i) {
-                    if (DOM.getInnerText(tdElems[i]).compareTo(pivot) < 0) {
-                        // Move i until the value is great than the pivot
-                        i++;
-                    } else if (k == i) {
-                        // Don't swap if equal
-                        k--;
-                    } else if (DOM.getInnerText(tdElems[k]).compareTo(pivot) < 0) {
-                        // Swap the elements at k and i
-                        Element tr = tdElems[i];
-                        tdElems[i] = tdElems[k];
-                        tdElems[k] = tr;
-                        i++;
-                        k--;
-                    } else {
-                        // Decrement k
-                        k--;
-                    }
-                }
-
-                // Swap k and pivot
-                if (k != start) {
-                    Element tr = tdElems[k];
-                    tdElems[k] = tdElems[start];
-                    tdElems[start] = tr;
-                }
-
-                // Sort the subsets
-                quicksort(tdElems, start, k - 1);
-                quicksort(tdElems, k + 1, end);
-            }
-        });
-
-    }
-
-}

Modified: branches/product_cleanup/integration/atom-client/src/test/java/org/mule/galaxy/atom/client/AtomGwtTest.java (2110 => 2111)

--- branches/product_cleanup/integration/atom-client/src/test/java/org/mule/galaxy/atom/client/AtomGwtTest.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/integration/atom-client/src/test/java/org/mule/galaxy/atom/client/AtomGwtTest.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -3,9 +3,9 @@
 import java.util.List;
 
 import org.mule.galaxy.Item;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.RegistryService;
-import org.mule.galaxy.web.rpc.WSearchResults;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryService;
+import org.mule.galaxy.repository.rpc.WSearchResults;
 
 public class AtomGwtTest extends AbstractAtomTest {
     protected RegistryService gwtRegistry;

Modified: branches/product_cleanup/repository/gwt-client/pom.xml (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/pom.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/pom.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -7,7 +7,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mule.galaxy</groupId>
-    <artifactId>galaxy-repository-client</artifactId>
+    <artifactId>galaxy-repository-gwt-client</artifactId>
     <version>2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Galaxy Repository: GWT Client</name>

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--<!DOCTYPE module PUBLIC "-//Google //DTD gwt-module-configuration XML V1.0//EN"-->
+            <!--"http://google-web-toolkit.googlecode.com/svn/tags/1.4.61/distro-source/core/src/gwt-module.dtd">-->
+        
+<module>
+
+    <!-- Inherit the core Web Toolkit stuff.                  -->
+    <inherits name='org.mule.galaxy.web.GalaxyLib'/>
+    <inherits name="com.google.gwt.gen2.table.Table"/>
+    
+    <source path="rpc"/>
+    <source path="client"/>
+
+    <public path="public">
+        <!--
+            Don't recursively include GWT compiler output when
+            developing with IDE and m2.
+        -->
+        <exclude name="org.mule.galaxy.web.Galaxy/**"/>
+        <exclude name="WEB-INF/**"/>
+        <exclude name="META-INF/**"/> 
+    </public>
+
+    <stylesheet src="application.css"/>
+
+</module>
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/RepositoryLib.gwt.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date Id
Name: svn:eol-style
   + native

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,5 @@
+package org.mule.galaxy.repository.client;
+
+public class RepositoryApplication {
+
+}
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryApplication.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryConstants.java (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/ui/RepositoryConstants.java) (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryConstants.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryConstants.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,124 @@
+package org.mule.galaxy.repository.client;
+
+/**
+ * Interface to represent the constants contained in resource bundle:
+ */
+public interface RepositoryConstants extends com.google.gwt.i18n.client.Constants {
+
+  /**
+   * Translated "Specify the type of item you are adding, the workspace (parent) where you want it stored, and a name for it. Additional fields appear depending on the type of item you select (see the <a href=\"http://www.mulesoft.org/display/TCAT/Managing+the+Repository\" target=\"_blank\">online help</a> for details). Click <b>Add</b> to create the item.".
+   *
+   * @return translated "Specify the type of item you are adding, the workspace (parent) where you want it stored, and a name for it. Additional fields appear depending on the type of item you select (see the <a href=\"http://www.mulesoft.org/display/TCAT/Managing+the+Repository\" target=\"_blank\">online help</a> for details). Click <b>Add</b> to create the item."
+   */
+  @DefaultStringValue("Specify the type of item you are adding, the workspace (parent) where you want it stored, and a name for it. Additional fields appear depending on the type of item you select (see the <a href=\"http://www.mulesoft.org/display/TCAT/Managing+the+Repository\" target=\"_blank\">online help</a> for details). Click <b>Add</b> to create the item.")
+  @Key("repo_Add_Item_Tip")
+  String repo_Add_Item_Tip();
+
+  /**
+   * Translated "Deletes the currently selected workspace(s) or artifact(s)".
+   *
+   * @return translated "Deletes the currently selected workspace(s) or artifact(s)"
+   */
+  @DefaultStringValue("Deletes the currently selected workspace(s) or artifact(s)")
+  @Key("repo_Delete")
+  String repo_Delete();
+
+  /**
+   * Translated "Display related help topic on www.mulesoft.org".
+   *
+   * @return translated "Display related help topic on www.mulesoft.org"
+   */
+  @DefaultStringValue("Display related help topic on www.mulesoft.org")
+  @Key("repo_HelpLink")
+  String repo_HelpLink();
+
+  /**
+   * Translated "View and edit the name, metadata, and comments for the current workspace or item".
+   *
+   * @return translated "View and edit the name, metadata, and comments for the current workspace or item"
+   */
+  @DefaultStringValue("View and edit the name, metadata, and comments for the current workspace or item")
+  @Key("repo_Info_TabTip")
+  String repo_Info_TabTip();
+
+  /**
+   * Translated "Adds a new item to the repository".
+   *
+   * @return translated "Adds a new item to the repository"
+   */
+  @DefaultStringValue("Adds a new item to the repository")
+  @Key("repo_Items_New")
+  String repo_Items_New();
+
+  /**
+   * Translated "Add, view, and delete items in the repository".
+   *
+   * @return translated "Add, view, and delete items in the repository"
+   */
+  @DefaultStringValue("Add, view, and delete items in the repository")
+  @Key("repo_Items_TabTip")
+  String repo_Items_TabTip();
+
+  /**
+   * Translated "Adds a new artifact (file) to the current workspace".
+   *
+   * @return translated "Adds a new artifact (file) to the current workspace"
+   */
+  @DefaultStringValue("Adds a new artifact (file) to the current workspace")
+  @Key("repo_NewArtifact")
+  String repo_NewArtifact();
+
+  /**
+   * Translated "Adds a new workspace under the current workspace".
+   *
+   * @return translated "Adds a new workspace under the current workspace"
+   */
+  @DefaultStringValue("Adds a new workspace under the current workspace")
+  @Key("repo_NewWorkspace")
+  String repo_NewWorkspace();
+
+  /**
+   * Translated "Apply policies to the different lifecycle phases for the current workspace or item".
+   *
+   * @return translated "Apply policies to the different lifecycle phases for the current workspace or item"
+   */
+  @DefaultStringValue("Apply policies to the different lifecycle phases for the current workspace or item")
+  @Key("repo_Policies_TabTip")
+  String repo_Policies_TabTip();
+
+  /**
+   * Translated "Specify the type of access each role has to the current workspace or item".
+   *
+   * @return translated "Specify the type of access each role has to the current workspace or item"
+   */
+  @DefaultStringValue("Specify the type of access each role has to the current workspace or item")
+  @Key("repo_Security_TabTip")
+  String repo_Security_TabTip();
+
+  /**
+   * Translated "For each role, specify how users with that role can access this artifact or workspace. In the row for the role whose permissions you want to change, select whether you want to grant or revoke the right to read, modify, or delete the item, or to manage policies for the item.".
+   *
+   * @return translated "For each role, specify how users with that role can access this artifact or workspace. In the row for the role whose permissions you want to change, select whether you want to grant or revoke the right to read, modify, or delete the item, or to manage policies for the item."
+   */
+  @DefaultStringValue("For each role, specify how users with that role can access this artifact or workspace. In the row for the role whose permissions you want to change, select whether you want to grant or revoke the right to read, modify, or delete the item, or to manage policies for the item.")
+  @Key("repo_Security_Tip")
+  String repo_Security_Tip();
+
+  /**
+   * Translated "Manage your repository of applications, servers, and server groups".
+   *
+   * @return translated "Manage your repository of applications, servers, and server groups"
+   */
+  @DefaultStringValue("Manage your repository of applications, servers, and server groups")
+  @Key("repo_TabTip")
+  String repo_TabTip();
+
+  /**
+   * Translated "The repository stores applications and other objects as <i>artifacts</i>. Artifacts are organized into <i>workspaces</i>, such as the Applications workspace where your applications are stored by default. You can search or browse the repository, view the details of your artifacts, and add metadata and comments about them.".
+   *
+   * @return translated "The repository stores applications and other objects as <i>artifacts</i>. Artifacts are organized into <i>workspaces</i>, such as the Applications workspace where your applications are stored by default. You can search or browse the repository, view the details of your artifacts, and add metadata and comments about them."
+   */
+  @DefaultStringValue("The repository stores applications and other objects as <i>artifacts</i>. Artifacts are organized into <i>workspaces</i>, such as the Applications workspace where your applications are stored by default. You can search or browse the repository, view the details of your artifacts, and add metadata and comments about them.")
+  @Key("repo_Tip")
+  String repo_Tip();
+}

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryMessages.java (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/ui/RepositoryMessages.java) (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryMessages.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryMessages.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,4 @@
+package org.mule.galaxy.repository.client;
+
+public interface RepositoryMessages extends com.google.gwt.i18n.client.Messages {
+}

Added: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,125 @@
+package org.mule.galaxy.repository.client;
+
+import org.mule.galaxy.repository.client.activity.ActivityPanel;
+import org.mule.galaxy.repository.client.admin.LifecycleForm;
+import org.mule.galaxy.repository.client.admin.LifecycleListPanel;
+import org.mule.galaxy.repository.client.admin.PolicyPanel;
+import org.mule.galaxy.repository.client.admin.PropertyDescriptorForm;
+import org.mule.galaxy.repository.client.admin.PropertyDescriptorListPanel;
+import org.mule.galaxy.repository.client.admin.TypeForm;
+import org.mule.galaxy.repository.client.admin.TypeListPanel;
+import org.mule.galaxy.repository.client.item.RepositoryMenuPanel;
+import org.mule.galaxy.repository.client.property.PropertyInterfaceManager;
+import org.mule.galaxy.repository.rpc.RegistryService;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.web.client.GalaxyModule;
+import org.mule.galaxy.web.client.NavMenuItem;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.rpc.ServiceDefTarget;
+
+public class RepositoryModule implements GalaxyModule {
+    private Galaxy galaxy;
+    private PropertyInterfaceManager propertyInterfaceManager = new PropertyInterfaceManager();
+    private RepositoryConstants repositoryConstants;
+    private RegistryServiceAsync registryService;
+    private int repositoryTabIndex;
+    private boolean showTypeSystem = true;
+    
+    public void initialize(Galaxy galaxy) {
+        this.galaxy = galaxy;
+        this.repositoryConstants = (RepositoryConstants) GWT.create(RepositoryConstants.class);
+
+        createService();
+    }
+
+    protected void addAdministrationMenuItems() {
+
+        AdministrationPanel adminPanel = galaxy.getAministrationPanel();
+        if (galaxy.hasPermission("VIEW_ACTIVITY")) {
+            adminPanel.addUtilityMenuItem(new NavMenuItem("Activity",
+                                                          "ActivityPanel",
+                                                          new ActivityPanel(adminPanel, galaxy, registryService),
+                                                          null));
+        }
+        
+        if (galaxy.hasPermission("MANAGE_LIFECYCLES")) {
+            NavMenuItem item = new NavMenuItem("Lifecycles",
+                                               "lifecycles",
+                                               new LifecycleListPanel(adminPanel, registryService),
+                                               new LifecycleForm(adminPanel, registryService));
+            adminPanel.addManageMenuItem(item);
+        }
+        
+        if (isShowTypeSystem()) {
+            if (galaxy.hasPermission("MANAGE_POLICIES")) {
+                NavMenuItem item = new NavMenuItem("Policies", "policies", new PolicyPanel(adminPanel, galaxy, registryService), null);
+                adminPanel.addManageMenuItem(item);
+            }
+
+            if (galaxy.hasPermission("MANAGE_PROPERTIES")) {
+                NavMenuItem item = new NavMenuItem("Properties",
+                        "properties",
+                        new PropertyDescriptorListPanel(adminPanel, registryService),
+                        new PropertyDescriptorForm(adminPanel, this));
+                adminPanel.addManageMenuItem(item);
+            }
+
+            if (galaxy.hasPermission("MANAGE_PROPERTIES")) {
+                NavMenuItem item = new NavMenuItem("Types",
+                        "types",
+                        new TypeListPanel(adminPanel, registryService),
+                        new TypeForm(adminPanel, this));
+                adminPanel.addManageMenuItem(item);
+            }
+        }
+    }
+    
+    protected RepositoryMenuPanel createRepositoryPanels() {
+        return new RepositoryMenuPanel(this);
+    }
+
+    public int getRepositoryTab() {
+        return repositoryTabIndex;
+    }
+
+    protected void loadRepositoryTab() {
+        repositoryTabIndex = galaxy.getPageManager().createTab("Repository", "item", repositoryConstants.repo_TabTip());
+        createRepositoryPanels();
+    }
+
+    private void createService() {
+        this.registryService = (RegistryServiceAsync) GWT.create(RegistryService.class);
+        ServiceDefTarget target = (ServiceDefTarget) registryService;
+        String baseUrl = GWT.getModuleBaseURL();
+        target.setServiceEntryPoint(baseUrl + "../handler/registry.rpc");
+    }
+
+    public Galaxy getGalaxy() {
+        return galaxy;
+    }
+
+    public PropertyInterfaceManager getPropertyInterfaceManager() {
+        return propertyInterfaceManager;
+    }
+
+    public RepositoryConstants getRepositoryConstants() {
+        return repositoryConstants;
+    }
+
+    public RegistryServiceAsync getRegistryService() {
+        return registryService;
+    }
+
+    public boolean isShowTypeSystem() {
+        return showTypeSystem;
+    }
+
+    public void setShowTypeSystem(boolean showTypeSystem) {
+        this.showTypeSystem = showTypeSystem;
+    }
+    
+
+}
Property changes on: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/RepositoryModule.java
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/activity) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/ActivityPanel.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/activity/ActivityPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/ActivityPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,14 +16,19 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.activity;
+package org.mule.galaxy.repository.client.activity;
 
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+
+import org.mule.galaxy.repository.client.util.ItemPathOracle;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
 import org.mule.galaxy.web.client.AbstractFlowComposite;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.util.ItemPathOracle;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 import org.mule.galaxy.web.rpc.WActivity;
 import org.mule.galaxy.web.rpc.WUser;
@@ -48,10 +53,6 @@
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.SuggestBox;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-
 public class ActivityPanel extends AbstractFlowComposite {
 
     private ListBox userLB;
@@ -67,11 +68,13 @@
     private DateField startDate;
     private DateField endDate;
     private final ErrorPanel errorPanel;
+    private final RegistryServiceAsync service;
 
-    public ActivityPanel(ErrorPanel errorPanel, final Galaxy galaxy) {
+    public ActivityPanel(ErrorPanel errorPanel, final Galaxy galaxy, RegistryServiceAsync service) {
         super();
         this.errorPanel = errorPanel;
         this.galaxy = galaxy;
+        this.service = service;
     }
 
     public void initialize() {
@@ -136,7 +139,7 @@
         searchTable.setWidget(0, 5, textTB);
 
         searchTable.setWidget(1, 4, new Label("Relating to:"));
-        itemSB = new SuggestBox(new ItemPathOracle(galaxy, errorPanel));
+        itemSB = new SuggestBox(new ItemPathOracle(service, errorPanel));
         itemSB.setStyleName("x-form-text");
         itemSB.setText("[All Items]");
         searchTable.setWidget(1, 5, itemSB);
@@ -220,36 +223,17 @@
         Date toDate = endDate.getValue();
 
         if(fromDate != null && endDate != null) {
-            galaxy.getRegistryService().getActivities(fromDate, toDate, user,
-                    itemSB.getText(),
-                    textTB.getValue(),
-                    eventType, resultStart, maxResults,
-                    ascending, callback);
+            service.getActivities(fromDate, toDate, user,
+                                  itemSB.getText(),
+                                  textTB.getValue(),
+                                  eventType, resultStart, maxResults,
+                                  ascending, callback);
 
         }
 
 
     }
 
-    private Date parseDate(String s) throws DateParseException {
-        if (s.length() != 10 || s.charAt(4) != '-' || s.charAt(7) != '-') {
-            throw new DateParseException();
-        }
-
-        String yearStr = s.substring(0, 4);
-        String monthStr = s.substring(5, 7);
-        String dayStr = s.substring(8, 10);
-
-        try {
-            int year = new Integer(yearStr).intValue();
-            int month = new Integer(monthStr).intValue();
-            int day = new Integer(dayStr).intValue();
-            return new Date(year - 1900, month - 1, day);
-        } catch (NumberFormatException e) {
-            throw new DateParseException();
-        }
-    }
-
     protected void loadResults(Collection o) {
         resultsPanel.clear();

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/DateParseException.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/activity/DateParseException.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/activity/DateParseException.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.activity;
+package org.mule.galaxy.repository.client.activity;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/InnerPropertyDescriptorForm.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/InnerPropertyDescriptorForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/InnerPropertyDescriptorForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,12 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
+import org.mule.galaxy.repository.client.property.PropertyInterfaceManager;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.rpc.WExtensionInfo;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
 
 import com.extjs.gxt.ui.client.widget.form.TextField;
 import com.google.gwt.event.dom.client.ChangeEvent;
@@ -47,10 +48,13 @@
     private ListBox typeLB;
     private HashMap<String, TextField<String>> fields;
     private Galaxy galaxy;
+    private PropertyInterfaceManager propertyManager;
 
     public void initialize(Galaxy galaxy,
+                           PropertyInterfaceManager propertyManager,
                            WPropertyDescriptor pd,
                            final FlexTable table) {
+        this.propertyManager = propertyManager;
         this.property = pd;
         this.galaxy = galaxy;
         table.setText(0, 0, "Name:");
@@ -98,7 +102,7 @@
             WExtensionInfo e = (WExtensionInfo) itr.next();
 
             // Only show properties which we have edit renderers for
-            if (galaxy.getPropertyInterfaceManager().isExtensionEditable(e.getId())) {
+            if (propertyManager.isExtensionEditable(e.getId())) {
                 typeLB.addItem(e.getDescription(), e.getId());
 
                 if (e.getId().equals(property.getExtension())) {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleForm.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/LifecycleForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,16 +16,21 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.repository.rpc.WPhase;
 import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationForm;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
 import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
 import org.mule.galaxy.web.client.util.LightBox;
 import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
 import org.mule.galaxy.web.client.validation.ui.ValidatableTextBox;
-import org.mule.galaxy.web.rpc.WLifecycle;
-import org.mule.galaxy.web.rpc.WPhase;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
 import com.extjs.gxt.ui.client.event.Listener;
@@ -47,10 +52,7 @@
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 
-
 public class LifecycleForm extends AbstractAdministrationForm {
 
     private WLifecycle lifecycle;
@@ -65,16 +67,18 @@
     private CheckBox defaultLifecycleCB;
     private static Button ok;
     private static Button cancel;
+    private final RegistryServiceAsync registryService;
 
-    public LifecycleForm(AdministrationPanel adminPanel) {
+    public LifecycleForm(AdministrationPanel adminPanel, RegistryServiceAsync registryService) {
         super(adminPanel, "lifecycles", "Lifecycle was saved.", "Lifecycle was deleted.",
                 "A lifecycle with that name already exists");
+        this.registryService = registryService;
 
         panel.setStyleName("lifecycle-form-base");
     }
 
     protected void fetchItem(String id) {
-        adminPanel.getRegistryService().getLifecycle(id, getFetchCallback());
+        registryService.getLifecycle(id, getFetchCallback());
     }
 
     protected void initializeItem(Object o) {
@@ -346,7 +350,7 @@
         lifecycle.setName(nameTB.getValue());
         lifecycle.setInitialPhase(initialPhase);
 
-        adminPanel.getRegistryService().saveLifecycle(lifecycle, getSaveCallback());
+        registryService.saveLifecycle(lifecycle, getSaveCallback());
     }
 
     protected void delete() {
@@ -356,7 +360,7 @@
 
                 if (Dialog.YES.equals(btn.getItemId())) {
                     LifecycleForm.super.delete();
-                    adminPanel.getRegistryService().deleteLifecycle(lifecycle.getId(), getDeleteCallback());
+                    registryService.deleteLifecycle(lifecycle.getId(), getDeleteCallback());
                 }
             }
         };

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleListPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/LifecycleListPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/LifecycleListPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,14 +16,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationComposite;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
+import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
+import org.mule.galaxy.web.client.util.FauxLinkRenderer;
 import org.mule.galaxy.web.client.util.ListCellRenderer;
-import org.mule.galaxy.web.client.util.FauxLinkRenderer;
-import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.WLifecycle;
-import org.mule.galaxy.web.rpc.WUser;
 
 import com.extjs.gxt.ui.client.data.BeanModel;
 import com.extjs.gxt.ui.client.data.BeanModelFactory;
@@ -44,21 +50,20 @@
 import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
 import com.google.gwt.user.client.History;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 public class LifecycleListPanel extends AbstractAdministrationComposite {
 
-    public LifecycleListPanel(AdministrationPanel a) {
+    private final RegistryServiceAsync registryService;
+
+    public LifecycleListPanel(AdministrationPanel a, RegistryServiceAsync registryService) {
         super(a);
+        this.registryService = registryService;
     }
 
     @Override
     public void doShowPage() {
         super.doShowPage();
 
-        adminPanel.getRegistryService().getLifecycles(new AbstractCallback<Collection<WLifecycle>>(adminPanel) {
+        registryService.getLifecycles(new AbstractCallback<Collection<WLifecycle>>(adminPanel) {
 
             public void onSuccess(Collection<WLifecycle> lifecycles) {
                 showLifecycles(lifecycles);

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PolicyPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/PolicyPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PolicyPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,25 +16,25 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.mule.galaxy.repository.client.item.PolicyResultsPanel;
+import org.mule.galaxy.repository.client.util.LifecycleSelectionPanel;
+import org.mule.galaxy.repository.client.util.PolicySelectionPanel;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPolicyException;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.PageInfo;
-import org.mule.galaxy.web.client.item.PolicyResultsPanel;
 import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.util.LifecycleSelectionPanel;
-import org.mule.galaxy.web.client.util.PolicySelectionPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WPolicyException;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
 import com.extjs.gxt.ui.client.event.SelectionListener;
@@ -64,16 +64,16 @@
     private String workspaceId;
     private final Galaxy galaxy;
 
-    public PolicyPanel(ErrorPanel adminPanel, Galaxy galaxy) {
-        this(adminPanel, galaxy, null);
+    public PolicyPanel(ErrorPanel adminPanel, Galaxy galaxy, RegistryServiceAsync registryService) {
+        this(adminPanel, galaxy, registryService, null);
     }
 
-    public PolicyPanel(ErrorPanel adminPanel, Galaxy galaxy, String workspaceId) {
+    public PolicyPanel(ErrorPanel adminPanel, Galaxy galaxy, RegistryServiceAsync registryService, String workspaceId) {
         super();
         this.menuPanel = adminPanel;
         this.galaxy = galaxy;
         this.workspaceId = workspaceId;
-        this.svc = galaxy.getRegistryService();
+        this.svc = registryService;
 
         panel = new InlineFlowPanel();

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorForm.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/PropertyDescriptorForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,10 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationForm;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
 
 import com.extjs.gxt.ui.client.event.Listener;
 import com.extjs.gxt.ui.client.event.MessageBoxEvent;
@@ -32,19 +34,22 @@
 
     private WPropertyDescriptor property;
     private InnerPropertyDescriptorForm innerForm;
+    private final RepositoryModule repositoryModule;
 
-    public PropertyDescriptorForm(AdministrationPanel adminPanel){
+    public PropertyDescriptorForm(AdministrationPanel adminPanel, 
+                                  RepositoryModule repositoryModule){
         super(adminPanel, "properties", "Property was saved.", "Property was deleted.",
               "A property with that name already exists.");
+        this.repositoryModule = repositoryModule;
     }
 
     protected void addFields(final FlexTable table) {
         this.innerForm = new InnerPropertyDescriptorForm();
-        innerForm.initialize(galaxy, property, table);
+        innerForm.initialize(galaxy, repositoryModule.getPropertyInterfaceManager(), property, table);
     }
 
     protected void fetchItem(String id) {
-        adminPanel.getRegistryService().getPropertyDescriptor(id, getFetchCallback());
+        repositoryModule.getRegistryService().getPropertyDescriptor(id, getFetchCallback());
     }
 
     public String getTitle() {
@@ -71,7 +76,7 @@
 
         property = innerForm.getPropertyDescriptor();
 
-        galaxy.getRegistryService().savePropertyDescriptor(property, getSaveCallback());
+        repositoryModule.getRegistryService().savePropertyDescriptor(property, getSaveCallback());
     }
 
     protected void delete() {
@@ -82,8 +87,7 @@
 
             if (Dialog.YES.equals(btn.getItemId())) {
               PropertyDescriptorForm.super.delete();
-              RegistryServiceAsync svc = adminPanel.getRegistryService();
-              svc.deletePropertyDescriptor(property.getId(), getDeleteCallback());
+              repositoryModule.getRegistryService().deletePropertyDescriptor(property.getId(), getDeleteCallback());
             }
           }
         };

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorListPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/PropertyDescriptorListPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/PropertyDescriptorListPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,12 +16,18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
-import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
 import org.mule.galaxy.web.client.WidgetHelper;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationComposite;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
 import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
+import org.mule.galaxy.web.rpc.AbstractCallback;
 
 import com.extjs.gxt.ui.client.data.BeanModel;
 import com.extjs.gxt.ui.client.data.BeanModelFactory;
@@ -33,7 +39,6 @@
 import com.extjs.gxt.ui.client.store.ListStore;
 import com.extjs.gxt.ui.client.store.Store;
 import com.extjs.gxt.ui.client.widget.ContentPanel;
-import com.extjs.gxt.ui.client.widget.layout.FitLayout;
 import com.extjs.gxt.ui.client.widget.form.StoreFilterField;
 import com.extjs.gxt.ui.client.widget.grid.ColumnConfig;
 import com.extjs.gxt.ui.client.widget.grid.ColumnData;
@@ -41,25 +46,24 @@
 import com.extjs.gxt.ui.client.widget.grid.Grid;
 import com.extjs.gxt.ui.client.widget.grid.GridCellRenderer;
 import com.extjs.gxt.ui.client.widget.grid.RowNumberer;
-import com.extjs.gxt.ui.client.widget.grid.BufferView;
 import com.extjs.gxt.ui.client.widget.toolbar.FillToolItem;
 import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
 import com.google.gwt.user.client.History;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class PropertyDescriptorListPanel
         extends AbstractAdministrationComposite {
-    public PropertyDescriptorListPanel(AdministrationPanel a) {
+    private final RegistryServiceAsync registryService;
+
+    public PropertyDescriptorListPanel(AdministrationPanel a, RegistryServiceAsync registryService) {
         super(a);
+        this.registryService = registryService;
     }
 
     @Override
     public void doShowPage() {
         super.doShowPage();
 
-        adminPanel.getRegistryService().getPropertyDescriptors(false, new AbstractCallback<List<WPropertyDescriptor>>(adminPanel) {
+        registryService.getPropertyDescriptors(false, new AbstractCallback<List<WPropertyDescriptor>>(adminPanel) {
 
             public void onSuccess(List<WPropertyDescriptor> result) {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeForm.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/TypeForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,19 +16,22 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.util.PropertyDescriptorComparator;
+import org.mule.galaxy.repository.client.util.StylizedSortableGrid;
+import org.mule.galaxy.repository.client.util.WTypeComparator;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.rpc.WType;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationForm;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
 import org.mule.galaxy.web.client.util.LightBox;
-import org.mule.galaxy.web.client.util.PropertyDescriptorComparator;
-import org.mule.galaxy.web.client.util.StylizedSortableGrid;
-import org.mule.galaxy.web.client.util.WTypeComparator;
 import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
 import org.mule.galaxy.web.client.validation.ui.ValidatableTextBox;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.extjs.gxt.ui.client.event.Listener;
 import com.extjs.gxt.ui.client.event.MessageBoxEvent;
@@ -66,10 +69,14 @@
     private List<WPropertyDescriptor> globalProperties;
     private SortableGrid propertiesTable;
     private InnerPropertyDescriptorForm innerForm;
+    private final RegistryServiceAsync registryService;
+    private final RepositoryModule repositoryModule;
 
-    public TypeForm(AdministrationPanel adminPanel) {
+    public TypeForm(AdministrationPanel adminPanel, RepositoryModule repositoryModule) {
         super(adminPanel, "types", "Type was saved.", "Type was deleted.",
                 "A type with that name already exists.");
+        this.repositoryModule = repositoryModule;
+        this.registryService = repositoryModule.getRegistryService();
     }
 
     protected void addFields(final FlexTable table) {
@@ -203,7 +210,7 @@
         FlexTable table = new FlexTable();
         container.add(table);
         this.innerForm = new InnerPropertyDescriptorForm();
-        innerForm.initialize(galaxy, p, table);
+        innerForm.initialize(galaxy, repositoryModule.getPropertyInterfaceManager(), p, table);
 
         Button cancel = new Button("Cancel");
         cancel.addClickHandler(new ClickHandler() {
@@ -253,7 +260,7 @@
     }
 
     protected void fetchItem(String id) {
-        adminPanel.getRegistryService().getType(id, getFetchCallback());
+        registryService.getType(id, getFetchCallback());
     }
 
     protected void initializeProperties(List<WPropertyDescriptor> pds) {
@@ -379,7 +386,7 @@
     }
 
     protected void intializeTypesAndProperties() {
-        adminPanel.getRegistryService().getTypes(new AbstractCallback<List<WType>>(errorPanel) {
+        registryService.getTypes(new AbstractCallback<List<WType>>(errorPanel) {
             public void onSuccess(List<WType> types) {
                 initializeTypes(types);
             }
@@ -391,7 +398,7 @@
             }
         });
 
-        adminPanel.getRegistryService().getPropertyDescriptors(false, new AbstractCallback(errorPanel) {
+        registryService.getPropertyDescriptors(false, new AbstractCallback(errorPanel) {
             public void onSuccess(Object pds) {
                 initializeProperties((List<WPropertyDescriptor>) pds);
             }
@@ -410,7 +417,7 @@
             return;
         }
 
-        RegistryServiceAsync svc = adminPanel.getRegistryService();
+        RegistryServiceAsync svc = registryService;
 
         type.setName(nameTB.getTextBox().getText());
         type.setAllowedChildrenIds(new ArrayList<String>());
@@ -444,8 +451,7 @@
 
                 if (Dialog.YES.equals(btn.getItemId())) {
                     TypeForm.super.delete();
-                    RegistryServiceAsync svc = adminPanel.getRegistryService();
-                    svc.deletePropertyDescriptor(type.getId(), getDeleteCallback());
+                    registryService.deletePropertyDescriptor(type.getId(), getDeleteCallback());
                 }
             }
         };

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeListPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/admin/TypeListPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/admin/TypeListPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,11 +16,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.admin;
+package org.mule.galaxy.repository.client.admin;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.web.client.WidgetHelper;
+import org.mule.galaxy.web.client.admin.AbstractAdministrationComposite;
+import org.mule.galaxy.web.client.admin.AdministrationPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.extjs.gxt.ui.client.data.BeanModel;
 import com.extjs.gxt.ui.client.data.BeanModelFactory;
@@ -44,22 +50,21 @@
 import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
 import com.google.gwt.user.client.History;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class TypeListPanel
         extends AbstractAdministrationComposite {
     protected List<WType> types;
+    private final RegistryServiceAsync registryService;
 
-    public TypeListPanel(AdministrationPanel a) {
+    public TypeListPanel(AdministrationPanel a, RegistryServiceAsync registryService) {
         super(a);
+        this.registryService = registryService;
     }
 
     @Override
     public void doShowPage() {
         super.doShowPage();
 
-        adminPanel.getRegistryService().getTypes(new AbstractCallback<List<WType>>(adminPanel) {
+        registryService.getTypes(new AbstractCallback<List<WType>>(adminPanel) {
 
             public void onSuccess(List<WType> types) {
                 TypeListPanel.this.types = types;

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/AbstractBrowsePanel.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry/AbstractBrowsePanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/AbstractBrowsePanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,19 +16,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.registry;
+package org.mule.galaxy.repository.client.browse;
 
-import com.google.gwt.user.client.ui.Widget;
-
 import java.util.List;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WSearchResults;
 import org.mule.galaxy.web.client.AbstractWithTopComposite;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.util.Toolbox;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WSearchResults;
 
+import com.google.gwt.user.client.ui.Widget;
+
 /**
  * The basis for any form that lists out groups of artifacts.
  */
@@ -39,10 +40,12 @@
     protected final Galaxy galaxy;
     private boolean first = true;
     protected int resultStart;
+    private final RepositoryModule repository;
 
-    public AbstractBrowsePanel(Galaxy galaxy) {
-        this.galaxy = galaxy;
-        this.service = galaxy.getRegistryService();
+    public AbstractBrowsePanel(RepositoryModule repository) {
+        this.repository = repository;
+        this.galaxy = repository.getGalaxy();
+        this.service = repository.getRegistryService();
 
         Widget main = getMainPanel();
 
@@ -67,7 +70,7 @@
         }
 
         if (first) {
-            artifactListPanel = new ArtifactListPanel(this, galaxy);
+            artifactListPanel = new ArtifactListPanel(this, repository);
         }
 
         artifactListPanel.setResultStart(resultStart);

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/ArtifactListPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry/ArtifactListPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/ArtifactListPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.registry;
+package org.mule.galaxy.repository.client.browse;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,12 +24,13 @@
 import java.util.List;
 import java.util.Map;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.WSearchResults;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
 import org.mule.galaxy.web.client.util.TooltipListener;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.WSearchResults;
 
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.Window;
@@ -64,10 +65,12 @@
     private Hyperlink cancelLink;
     private Hyperlink editAll;
     private Map<CheckBox, String> CBCollection;
+    private RepositoryModule repository;
     
-    public ArtifactListPanel(AbstractBrowsePanel browsePanel, Galaxy galaxy) {
+    public ArtifactListPanel(AbstractBrowsePanel browsePanel, RepositoryModule repository) {
         super();
-        this.galaxy = galaxy;
+        this.galaxy = repository.getGalaxy();
+        this.repository = repository;
         this.browsePanel = browsePanel;
 
         panel = new FlowPanel();
@@ -293,13 +296,13 @@
 
             // edit only what the user selectes via the checkboxes
         } else if (sender == editSelected) {
-            galaxy.getPageManager().createPageInfo("bulk-edit", new BulkEditPanel(getSelectedArtifacts(), galaxy), 0);
+            galaxy.getPageManager().createPageInfo("bulk-edit", new BulkEditPanel(getSelectedArtifacts(), repository), 0);
             History.newItem("bulk-edit");
 
             // edit the entire result set
             setEditable(false);
         } else if (sender == editAll) {
-            galaxy.getPageManager().createPageInfo("bulk-edit", new BulkEditPanel(searchResults.getQuery(), searchResults.getTotal(), galaxy), 0);
+            galaxy.getPageManager().createPageInfo("bulk-edit", new BulkEditPanel(searchResults.getQuery(), searchResults.getTotal(), repository), 0);
             History.newItem("bulk-edit");
 
             // toggle edit mode

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/BulkEditPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry/BulkEditPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/BulkEditPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.registry;
+package org.mule.galaxy.repository.client.browse;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -26,16 +26,17 @@
 import java.util.List;
 import java.util.Map;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.admin.PolicyPanel;
+import org.mule.galaxy.repository.client.property.AbstractPropertyRenderer;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPolicyException;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
 import org.mule.galaxy.web.client.AbstractErrorShowingComposite;
 import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.admin.PolicyPanel;
-import org.mule.galaxy.web.client.property.AbstractPropertyRenderer;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
 import org.mule.galaxy.web.rpc.SecurityService;
 import org.mule.galaxy.web.rpc.WPermission;
-import org.mule.galaxy.web.rpc.WPolicyException;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.History;
@@ -89,22 +90,26 @@
 
     private Collection<String> entryIds;
 
-    private Repository repository;
+    private final Galaxy galaxy;
 
-    public BulkEditPanel(Collection<String> entryIds, Repository repository) {
+    private final RepositoryModule repositoryModule;
+
+
+    public BulkEditPanel(Collection<String> entryIds, RepositoryModule repository) {
         this(entryIds.size(), repository);
         this.entryIds = entryIds;
     }
     
-    public BulkEditPanel(String query, long resultCount, Repository repository) {
+    public BulkEditPanel(String query, long resultCount, RepositoryModule repository) {
         this(resultCount, repository);
         this.query = query;
     }
     
-    public BulkEditPanel(long resultCount, Repository repository) {
+    public BulkEditPanel(long resultCount, RepositoryModule repository) {
         this.resultCount = resultCount;
-        this.repository = repository;
-        this.service = repository.getGalaxy().getRegistryService();
+        this.repositoryModule = repository;
+        this.galaxy = repository.getGalaxy();
+        this.service = repository.getRegistryService();
         this.permissions = new ArrayList();
         this.groups = new HashMap();
 
@@ -233,9 +238,9 @@
         propertyDescriptor = getPropertyDescriptor(txt);
 
         renderer = 
-            repository.getPropertyInterfaceManager().createRenderer(propertyDescriptor.getExtension(), 
+            repositoryModule.getPropertyInterfaceManager().createRenderer(propertyDescriptor.getExtension(), 
                                                                     propertyDescriptor.isMultiValued());
-        renderer.initialize(repository.getGalaxy(), this, null, true);
+        renderer.initialize(repositoryModule, this, null, true);
         
         table.setWidget(0, 4, renderer.createEditForm());
     }
@@ -295,7 +300,7 @@
 
     // RPC call to get list of available permissions
     private void fetchPermissions() {
-        repository.getGalaxy().getSecurityService().getPermissions(SecurityService.ITEM_PERMISSIONS, new AbstractCallback(this) {
+        galaxy.getSecurityService().getPermissions(SecurityService.ITEM_PERMISSIONS, new AbstractCallback(this) {
             public void onFailure(Throwable caught) {
                 super.onFailure(caught);
             }
@@ -315,7 +320,7 @@
 
     //RPC call to get list of available groups
     private void fetchGroups() {
-        repository.getGalaxy().getSecurityService().getGroupPermissions(new AbstractCallback(this) {
+        galaxy.getSecurityService().getGroupPermissions(new AbstractCallback(this) {
 
             public void onFailure(Throwable caught) {
                 super.onFailure(caught);
@@ -402,7 +407,7 @@
                 if (caught instanceof WPolicyException) {
                     WPolicyException pe = (WPolicyException) caught;
 
-                    PolicyPanel.handlePolicyFailure(repository.getGalaxy(), pe);
+                    PolicyPanel.handlePolicyFailure(galaxy, pe);
                 } else {
                     super.onFailure(caught);
                 }
@@ -413,11 +418,10 @@
             }
         };
         
-        RegistryServiceAsync svc = repository.getGalaxy().getRegistryService();
         if (entryIds != null) {
-            svc.setProperty(entryIds, propertyDescriptor.getName(), (Serializable)value, callback);
+            service.setProperty(entryIds, propertyDescriptor.getName(), (Serializable)value, callback);
         } else {
-            svc.setPropertyForQuery(query, propertyDescriptor.getName(), (Serializable)value, callback);
+            service.setPropertyForQuery(query, propertyDescriptor.getName(), (Serializable)value, callback);
         }
     }
 
@@ -439,7 +443,7 @@
                 if (caught instanceof WPolicyException) {
                     WPolicyException pe = (WPolicyException) caught;
 
-                    PolicyPanel.handlePolicyFailure(repository.getGalaxy(), pe);
+                    PolicyPanel.handlePolicyFailure(galaxy, pe);
                 } else {
                     super.onFailure(caught);
                 }

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/PolicyResultsPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/registry/PolicyResultsPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/browse/PolicyResultsPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.registry;
+package org.mule.galaxy.repository.client.browse;
 
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Label;

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddArtifactForm.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/AddArtifactForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddArtifactForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,17 +1,17 @@
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.web.client.util.AbstractErrorHandlingPopup;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 import org.mule.galaxy.web.rpc.ItemExistsException;
-import org.mule.galaxy.web.rpc.ItemInfo;
 import org.mule.galaxy.web.rpc.ItemNotFoundException;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
 import com.extjs.gxt.ui.client.event.Events;
@@ -30,7 +30,6 @@
 
     private String fileId;
     private List<WType> types;
-    private final Galaxy galaxy;
     private Button closeBtn;
     private Button submitBtn;
 
@@ -42,13 +41,14 @@
     private final boolean parentIsWorkspace;
     private FileUploadField file;
     private final ChildItemsPanel itemsPanel;
+    private final RegistryServiceAsync registryService;
 
-    public AddArtifactForm(final Galaxy galaxy,
+    public AddArtifactForm(final RegistryServiceAsync registryService,
                            ItemInfo parent,
                            boolean parentIsWorkspace, 
                            ChildItemsPanel itemsPanel) {
         super();
-        this.galaxy = galaxy;
+        this.registryService = registryService;
         this.parent = parent;
         this.parentIsWorkspace = parentIsWorkspace;
         this.itemsPanel = itemsPanel;
@@ -150,7 +150,7 @@
         fpanel.addListener(Events.Submit, new Listener<FormEvent>() {
             public void handleEvent(final FormEvent fe) {
 
-                galaxy.getRegistryService().getTypes(new AbstractCallback<List<WType>>(AddArtifactForm.this) {
+                registryService.getTypes(new AbstractCallback<List<WType>>(AddArtifactForm.this) {
                     public void onSuccess(List<WType> types) {
                         AddArtifactForm.this.submit(fe, types);
                     }
@@ -216,23 +216,19 @@
                 }
             }
 
-            galaxy.getRegistryService().addVersionedItem(parentPath,
-                                                         name,
-                                                         fversion.getRawValue(),
-                                                         null,
-                                                         artifactType.getId(),
-                                                         avType.getId(),
-                                                         new HashMap<String, Serializable>(),
-                                                         versionProperties, 
-                                                         callback);
+            registryService.addVersionedItem(parentPath,
+                                             name,
+                                             fversion.getRawValue(),
+                                             null,
+                                             artifactType.getId(),
+                                             avType.getId(),
+                                             new HashMap<String, Serializable>(),
+                                             versionProperties, 
+                                             callback);
         } else {
             String parentId = parent != null ? parent.getPath() : null;
-            galaxy.getRegistryService().addItem(parentId, 
-                                                fversion.getRawValue(), 
-                                                null, 
-                                                avType.getId(), 
-                                                versionProperties, 
-                                                callback);
+            registryService.addItem(parentId, fversion.getRawValue(), null, 
+                                    avType.getId(), versionProperties, callback);
         }
         
     }

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddItemForm.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/AddItemForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddItemForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -25,24 +25,25 @@
 import java.util.List;
 import java.util.Map;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.browse.PolicyResultsPanel;
+import org.mule.galaxy.repository.client.property.AbstractPropertyRenderer;
+import org.mule.galaxy.repository.client.property.ArtifactRenderer;
+import org.mule.galaxy.repository.client.property.PropertyInterfaceManager;
+import org.mule.galaxy.repository.client.util.AddItemHelper;
+import org.mule.galaxy.repository.client.util.ItemPathOracle;
+import org.mule.galaxy.repository.client.util.WTypeComparator;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.web.client.AbstractFlowComposite;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.property.AbstractPropertyRenderer;
-import org.mule.galaxy.web.client.property.ArtifactRenderer;
-import org.mule.galaxy.web.client.property.PropertyInterfaceManager;
-import org.mule.galaxy.web.client.registry.PolicyResultsPanel;
 import org.mule.galaxy.web.client.ui.help.InlineHelpPanel;
-import org.mule.galaxy.web.client.util.AddItemHelper;
-import org.mule.galaxy.web.client.util.ItemPathOracle;
 import org.mule.galaxy.web.client.util.StringUtil;
 import org.mule.galaxy.web.client.util.TooltipListener;
-import org.mule.galaxy.web.client.util.WTypeComparator;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 import org.mule.galaxy.web.rpc.ItemExistsException;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.extjs.gxt.ui.client.event.BaseEvent;
 import com.extjs.gxt.ui.client.event.ComponentEvent;
@@ -110,13 +111,14 @@
     private WType selectedVersion;
     private AddItemHelper form;
     private final ErrorPanel errorPanel;
+    private RepositoryModule repositoryModule;
 
-    public AddItemForm(final Galaxy galaxy, ErrorPanel errorPanel) {
-        this.galaxy = galaxy;
-        this.errorPanel = errorPanel;
+    public AddItemForm(RepositoryMenuPanel menuPanel) {
+        this.galaxy = menuPanel.getGalaxy();
+        this.repositoryModule = menuPanel.getRepositoryModule();
+        this.errorPanel = menuPanel;
 
-
-        form = new AddItemHelper(galaxy);
+        form = new AddItemHelper(repositoryModule.getRegistryService());
         form.setAction(GWT.getModuleBaseURL() + "../artifactUpload.form");
         form.addSubmitCompleteHandler(this);
 
@@ -127,10 +129,9 @@
         cp.setStyleName("x-panel-container-full");
         cp.add(form);
 
-
         // add inline help string and widget
         cp.setTopComponent(
-                new InlineHelpPanel(galaxy.getRepositoryConstants().repo_Add_Item_Tip(), 21));
+                new InlineHelpPanel(repositoryModule.getRepositoryConstants().repo_Add_Item_Tip(), 21));
 
         panel.add(cp);
     }
@@ -144,7 +145,7 @@
     public void showPage(List<String> params) {
         if (params.size() > 0) {
             itemId = params.get(0);
-            galaxy.getRegistryService().getItemInfo(itemId, false, new AbstractCallback<ItemInfo>(errorPanel) {
+            repositoryModule.getRegistryService().getItemInfo(itemId, false, new AbstractCallback<ItemInfo>(errorPanel) {
                 public void onSuccess(ItemInfo item) {
                     AddItemForm.this.item = item;
                     finishShow();
@@ -178,7 +179,7 @@
         // note how spacing uses a clear pixel on the second column
         table.setWidget(1, 0, new Label("Parent:"));
 
-        parentSB = new SuggestBox(new ItemPathOracle(galaxy, errorPanel));
+        parentSB = new SuggestBox(new ItemPathOracle(repositoryModule.getRegistryService(), errorPanel));
         parentSB.setStyleName("x-form-text");
 
         parentSB.getTextBox().setName("workspacePath");
@@ -199,7 +200,7 @@
         nameBox.setName("name");
         table.setWidget(2, 2, nameBox);
 
-        galaxy.getRegistryService().getTypes(new AbstractCallback<List<WType>>(errorPanel) {
+        repositoryModule.getRegistryService().getTypes(new AbstractCallback<List<WType>>(errorPanel) {
             public void onSuccess(List<WType> wtypes) {
                 Collections.sort(wtypes, new WTypeComparator());
                 AddItemForm.this.types = new HashMap<String, WType>();
@@ -368,7 +369,7 @@
         for (WPropertyDescriptor pd : props) {
             table.setText(row, 0, pd.getDescription());
             AbstractPropertyRenderer renderer = factory.createRenderer(pd.getExtension(), pd.isMultiValued());
-            renderer.initialize(galaxy, errorPanel, null, false);
+            renderer.initialize(repositoryModule, errorPanel, null, false);
             typeRenderers.put(pd.getName(), renderer);
             table.setWidget(row, 2, renderer.createEditForm());
 
@@ -511,7 +512,7 @@
         Map<String, Serializable> properties = getProperties(renderers);
 
         if (isUserSubmittingVersion()) {
-            galaxy.getRegistryService().addVersionedItem(parent,
+            repositoryModule.getRegistryService().addVersionedItem(parent,
                     name,
                     versionNameBox.getValue(),
                     null,
@@ -521,7 +522,7 @@
                     getProperties(versionRenderers),
                     callback);
         } else {
-            galaxy.getRegistryService().addItem(parent,
+            repositoryModule.getRegistryService().addItem(parent,
                     name,
                     null,
                     getType().getId(),

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddWorkspaceForm.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/AddWorkspaceForm.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/AddWorkspaceForm.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,13 +1,17 @@
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
-import org.mule.galaxy.web.client.Galaxy;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.web.client.util.AbstractErrorHandlingPopup;
 import org.mule.galaxy.web.client.validation.FieldNotEmptyValidator;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 import org.mule.galaxy.web.rpc.ItemExistsException;
-import org.mule.galaxy.web.rpc.ItemInfo;
 import org.mule.galaxy.web.rpc.ItemNotFoundException;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
 import com.extjs.gxt.ui.client.event.SelectionListener;
@@ -19,14 +23,10 @@
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.History;
 
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-
 public class AddWorkspaceForm extends AbstractErrorHandlingPopup {
 
     private List<WType> types;
-    private final Galaxy galaxy;
+    private final RegistryServiceAsync registryService;
     private Button closeBtn;
     private Button submitBtn;
 
@@ -35,10 +35,10 @@
     private TextField<String> fname;
     private final ItemInfo parent;
 
-    public AddWorkspaceForm(final Galaxy galaxy,
+    public AddWorkspaceForm(final RegistryServiceAsync registryService,
                             ItemInfo parent) {
         super();
-        this.galaxy = galaxy;
+        this.registryService = registryService;
         this.parent = parent;
 
         formData = new FormData("-20");
@@ -85,7 +85,7 @@
 
     protected void addWorkspace() {
         setEnabled(false);
-        galaxy.getRegistryService().getTypes(new AbstractCallback<List<WType>>(AddWorkspaceForm.this) {
+        registryService.getTypes(new AbstractCallback<List<WType>>(AddWorkspaceForm.this) {
             public void onSuccess(List<WType> types) {
                 addWorkspace(types);
             }
@@ -116,7 +116,7 @@
         };
 
         String parentId = parent != null ? parent.getPath() : null;
-        galaxy.getRegistryService().addItem(parentId,
+        registryService.addItem(parentId,
                 fname.getValue(),
                 null,
                 getTypeByName("Workspace").getId(),

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ChildItemsPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/ChildItemsPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ChildItemsPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,9 +1,11 @@
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.ItemInfo;
 import org.mule.galaxy.web.client.AbstractFlowComposite;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.WidgetHelper;
@@ -12,7 +14,6 @@
 import org.mule.galaxy.web.client.util.ToolbarButton;
 import org.mule.galaxy.web.client.util.ToolbarButtonEvent;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
 
 import com.extjs.gxt.ui.client.data.BeanModel;
 import com.extjs.gxt.ui.client.data.BeanModelFactory;
@@ -46,11 +47,12 @@
     private final Galaxy galaxy;
     private final ItemInfo info;
     private CheckBoxSelectionModel<BeanModel> selectionModel;
+    private RepositoryModule repository;
 
-
     public ChildItemsPanel(Galaxy galaxy, RepositoryMenuPanel menuPanel, ItemInfo item) {
         super();
         this.galaxy = galaxy;
+        this.repository = menuPanel.getRepositoryModule();
         this.menuPanel = menuPanel;
         this.info = item;
     }
@@ -71,7 +73,7 @@
             }
         };
 
-        galaxy.getRegistryService().getItems(info != null ? info.getId() : null, false, callback);
+        repository.getRegistryService().getItems(info != null ? info.getId() : null, false, callback);
     }
 
     /**
@@ -89,7 +91,7 @@
         cp.setAutoWidth(true);
 
         // add inline help string and widget
-        cp.setTopComponent(new InlineHelpPanel(galaxy.getRepositoryConstants().repo_Tip(), 14));
+        cp.setTopComponent(new InlineHelpPanel(repository.getRepositoryConstants().repo_Tip(), 14));
 
         BeanModelFactory factory = BeanModelLookup.get().getFactory(ItemInfo.class);
         List<BeanModel> model = factory.createModel(items);
@@ -165,7 +167,7 @@
         });
 
         final ToolbarButton delBtn = new ToolbarButton("Delete");
-        delBtn.setToolTip(galaxy.getRepositoryConstants().repo_Delete());
+        delBtn.setToolTip(repository.getRepositoryConstants().repo_Delete());
         delBtn.setStyleName("toolbar-btn_left");
         delBtn.setEnabled(false);
         delBtn.addSelectionListener(new SelectionListener<ToolbarButtonEvent>() {
@@ -199,7 +201,7 @@
                         showNewWorkspace();
                     }
                 });
-                newWkspaceBtn.setToolTip(galaxy.getRepositoryConstants().repo_NewWorkspace());
+                newWkspaceBtn.setToolTip(repository.getRepositoryConstants().repo_NewWorkspace());
                 toolbar.add(newWkspaceBtn);
                 
                 final ToolbarButton newArtifactBtn = new ToolbarButton("New Artifact");
@@ -210,7 +212,7 @@
                         showArtifactUploadForm(true);
                     }
                 });
-                newArtifactBtn.setToolTip(galaxy.getRepositoryConstants().repo_NewArtifact());
+                newArtifactBtn.setToolTip(repository.getRepositoryConstants().repo_NewArtifact());
                 toolbar.add(newArtifactBtn);
             } else if (info.getType().equals("Artifact")) {
                 final ToolbarButton newVersionBtn = new ToolbarButton("New Version");
@@ -222,7 +224,7 @@
                     }
                 });
                 
-                newVersionBtn.setToolTip(galaxy.getRepositoryConstants().repo_Items_New());
+                newVersionBtn.setToolTip(repository.getRepositoryConstants().repo_Items_New());
                 toolbar.add(newVersionBtn);
             } else {
                 String token;
@@ -232,7 +234,7 @@
                     token = "add-item/";
                 }
                 ToolbarButton newBtn = WidgetHelper.createToolbarHistoryButton("New", token,
-                        "toolbar-btn_right", galaxy.getRepositoryConstants().repo_Items_New());
+                        "toolbar-btn_right", repository.getRepositoryConstants().repo_Items_New());
                 toolbar.add(newBtn);
             }
         }
@@ -242,12 +244,12 @@
 
 
     protected void showArtifactUploadForm(boolean parentIsWorkspace) {
-        LightBox popup = new LightBox(new AddArtifactForm(galaxy, info, parentIsWorkspace, this));
+        LightBox popup = new LightBox(new AddArtifactForm(repository.getRegistryService(), info, parentIsWorkspace, this));
         popup.show();
     }
 
     protected void showNewWorkspace() {
-        LightBox popup = new LightBox(new AddWorkspaceForm(galaxy, info));
+        LightBox popup = new LightBox(new AddWorkspaceForm(repository.getRegistryService(), info));
         popup.show();
     }
 
@@ -263,7 +265,7 @@
                     }
 
                     // FIXME: delete collection.
-                    galaxy.getRegistryService().delete(ids, new AbstractCallback(menuPanel) {
+                    repository.getRegistryService().delete(ids, new AbstractCallback(menuPanel) {
                         public void onSuccess(Object arg0) {
                             fetchAllItems();
                             menuPanel.removeItems(info, ids);

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemInfoPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/ItemInfoPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemInfoPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,8 +16,21 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
+import java.util.Iterator;
+import java.util.List;
+
+import org.mule.galaxy.repository.client.property.EntryMetadataPanel;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WComment;
+import org.mule.galaxy.web.client.AbstractShowable;
+import org.mule.galaxy.web.client.util.InlineFlowPanel;
+import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
+import org.mule.galaxy.web.client.validation.ui.ValidatableTextArea;
+import org.mule.galaxy.web.rpc.AbstractCallback;
+
 import com.extjs.gxt.ui.client.event.ButtonEvent;
 import com.extjs.gxt.ui.client.event.SelectionListener;
 import com.extjs.gxt.ui.client.widget.button.Button;
@@ -38,35 +51,19 @@
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.Iterator;
-import java.util.List;
-
-import org.mule.galaxy.web.client.AbstractShowable;
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.property.EntryMetadataPanel;
-import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
-import org.mule.galaxy.web.client.validation.ui.ValidatableTextArea;
-import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.WComment;
-
 public class ItemInfoPanel extends AbstractShowable {
 
     private HorizontalPanel topPanel;
-    private Galaxy galaxy;
     private VerticalPanel rightGroup;
     private VerticalPanel panel;
     private FlowPanel commentsPanel;
     private ItemInfo info;
     private final RepositoryMenuPanel menuPanel;
     
-    public ItemInfoPanel(final Galaxy galaxy,
-                         RepositoryMenuPanel menuPanel,
+    public ItemInfoPanel(RepositoryMenuPanel menuPanel,
                          ItemInfo item, 
                          final ItemPanel artifactPanel, 
                          final List<String> callbackParams) {
-        this.galaxy = galaxy;
         this.menuPanel = menuPanel;
         this.info = item;
         
@@ -80,8 +77,7 @@
 
         FlexTable table = createColumnTable();
         
-        final NameEditPanel nep = new NameEditPanel(galaxy, 
-                                                    menuPanel,
+        final NameEditPanel nep = new NameEditPanel(menuPanel,
                                                     item.getId(),
                                                     item.getName(),
                                                     item.getParentPath(), 
@@ -105,7 +101,7 @@
         if (item.isLocal()) {
             panel.add(newSpacer());
             
-            panel.add(new EntryMetadataPanel(galaxy, menuPanel, "Metadata", item, false));
+            panel.add(new EntryMetadataPanel(menuPanel.getRepositoryModule(), menuPanel, "Metadata", item, false));
             panel.add(newSpacer());
             
             initComments();
@@ -266,7 +262,8 @@
         addButton.setEnabled(false);
         text.getTextArea().setEnabled(false);
         
-        galaxy.getRegistryService().addComment(info.getId(), parentId, text.getTextArea().getText(), new AbstractCallback(menuPanel) {
+        RegistryServiceAsync svc = menuPanel.getRepositoryModule().getRegistryService();
+        svc.addComment(info.getId(), parentId, text.getTextArea().getText(), new AbstractCallback(menuPanel) {
 
             public void onFailure(Throwable caught) {
                 super.onFailure(caught);

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/ItemPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,13 +16,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.admin.PolicyPanel;
+import org.mule.galaxy.repository.rpc.ItemInfo;
 import org.mule.galaxy.web.client.AbstractFlowComposite;
 import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.admin.PolicyPanel;
 import org.mule.galaxy.web.client.util.ShowableTabListener;
-import org.mule.galaxy.web.rpc.ItemInfo;
 import org.mule.galaxy.web.rpc.SecurityService;
 
 import com.extjs.gxt.ui.client.event.Events;
@@ -53,9 +54,11 @@
     private List<String> params;
     private RepositoryMenuPanel menuPanel;
     private TabPanel tabPanel;
+    private RepositoryModule repository;
 
-    public ItemPanel(Galaxy galaxy, RepositoryMenuPanel menuPanel) {
-        this.galaxy = galaxy;
+    public ItemPanel(RepositoryMenuPanel menuPanel) {
+        this.galaxy = menuPanel.getGalaxy();
+        this.repository = menuPanel.getRepositoryModule();
         this.menuPanel = menuPanel;
     }
 
@@ -95,26 +98,26 @@
         tabPanel.setAutoHeight(true);
 
         TabItem itemsTab = new TabItem("Items");
-        itemsTab.getHeader().setToolTip(galaxy.getRepositoryConstants().repo_Items_TabTip());
+        itemsTab.getHeader().setToolTip(repository.getRepositoryConstants().repo_Items_TabTip());
         itemsTab.add(new ChildItemsPanel(galaxy, menuPanel, info));
         tabPanel.add(itemsTab);
 
 
         TabItem infoTab = new TabItem("Info");
-        infoTab.getHeader().setToolTip(galaxy.getRepositoryConstants().repo_Info_TabTip());
-        infoTab.add(new ItemInfoPanel(galaxy, menuPanel, info, this, params));
+        infoTab.getHeader().setToolTip(repository.getRepositoryConstants().repo_Info_TabTip());
+        infoTab.add(new ItemInfoPanel(menuPanel, info, this, params));
         tabPanel.add(infoTab);
 
         if (galaxy.hasPermission("MANAGE_POLICIES") && info.isLocal()) {
             TabItem tab = new TabItem("Policies");
-            tab.getHeader().setToolTip(galaxy.getRepositoryConstants().repo_Policies_TabTip());
-            tab.add(new PolicyPanel(menuPanel, galaxy, itemId));
+            tab.getHeader().setToolTip(repository.getRepositoryConstants().repo_Policies_TabTip());
+            tab.add(new PolicyPanel(menuPanel, galaxy, repository.getRegistryService(), itemId));
             tabPanel.add(tab);
         }
 
         if (galaxy.hasPermission("MANAGE_GROUPS") && info.isLocal()) {
             TabItem tab = new TabItem("Security");
-            tab.getHeader().setToolTip(galaxy.getRepositoryConstants().repo_Security_TabTip());
+            tab.getHeader().setToolTip(repository.getRepositoryConstants().repo_Security_TabTip());
             tab.add(new ItemRolePermissionPanel(galaxy, menuPanel, info.getId(), SecurityService.ITEM_PERMISSIONS));
             tabPanel.add(tab);
         }

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemRolePermissionPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/ItemRolePermissionPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/ItemRolePermissionPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Widget;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/NameEditPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/NameEditPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/NameEditPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,8 +16,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
+import java.util.List;
+
+import org.mule.galaxy.repository.client.admin.PolicyPanel;
+import org.mule.galaxy.repository.client.util.ItemPathOracle;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPolicyException;
+import org.mule.galaxy.web.client.util.InlineFlowPanel;
+import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
+import org.mule.galaxy.web.client.validation.ui.ValidatableTextBox;
+import org.mule.galaxy.web.rpc.AbstractCallback;
+import org.mule.galaxy.web.rpc.ItemNotFoundException;
+
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Composite;
@@ -29,18 +41,6 @@
 import com.google.gwt.user.client.ui.SuggestBox;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.List;
-
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.admin.PolicyPanel;
-import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.util.ItemPathOracle;
-import org.mule.galaxy.web.client.validation.StringNotEmptyValidator;
-import org.mule.galaxy.web.client.validation.ui.ValidatableTextBox;
-import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemNotFoundException;
-import org.mule.galaxy.web.rpc.WPolicyException;
-
 /**
  * A panel for editing the name of a registry entry.
  */
@@ -50,22 +50,21 @@
     private final String itemId;
     private String name;
     private final String workspacePath;
-    private final Galaxy galaxy;
     private final RepositoryMenuPanel menuPanel;
     private final List<String> callbackParams;
+    private RegistryServiceAsync registryService;
 
-    public NameEditPanel(Galaxy galaxy,
-                         RepositoryMenuPanel menuPanel,
+    public NameEditPanel(RepositoryMenuPanel menuPanel,
                          String itemId,
                          String name,
                          String workspacePath,  
                          final List<String> callbackParams) {
         super();
-        this.galaxy = galaxy;
         this.menuPanel = menuPanel;
         this.itemId = itemId;
         this.name = name;
         this.workspacePath = workspacePath;
+        this.registryService = menuPanel.getRepositoryModule().getRegistryService();
 
         panel = new InlineFlowPanel();
         this.callbackParams = callbackParams;
@@ -96,7 +95,7 @@
 
         final HorizontalPanel row = new HorizontalPanel();
 
-        final SuggestBox workspaceSB = new SuggestBox(new ItemPathOracle(galaxy, menuPanel));
+        final SuggestBox workspaceSB = new SuggestBox(new ItemPathOracle(registryService, menuPanel));
         workspaceSB.setText(workspacePath);
         row.add(workspaceSB);
         
@@ -139,14 +138,14 @@
         if (!newParent.equals(this.workspacePath) 
             || !newName.equals(this.name)) {
             // save only if name or workspace changed
-            galaxy.getRegistryService().move(itemId, newParent, newName, new AbstractCallback(menuPanel) {
+            registryService.move(itemId, newParent, newName, new AbstractCallback(menuPanel) {
 
                 @Override
                 public void onFailure(Throwable caught) {
                     if (caught instanceof ItemNotFoundException) {
                         menuPanel.setMessage("No parent workspace exists with that name!");
                     } else if (caught instanceof WPolicyException) {
-                        PolicyPanel.handlePolicyFailure(galaxy, (WPolicyException) caught);
+                        PolicyPanel.handlePolicyFailure(menuPanel.getGalaxy(), (WPolicyException) caught);
                     } else {
                         super.onFailure(caught);
                     }

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/PolicyResultsPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/PolicyResultsPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/PolicyResultsPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Hyperlink;
@@ -27,10 +27,10 @@
 import java.util.List;
 import java.util.Map;
 
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.WApprovalMessage;
 import org.mule.galaxy.web.client.AbstractErrorShowingComposite;
 import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.WApprovalMessage;
 
 public class PolicyResultsPanel extends AbstractErrorShowingComposite {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/RepositoryMenuPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/item/RepositoryMenuPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/item/RepositoryMenuPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.item;
+package org.mule.galaxy.repository.client.item;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,6 +7,9 @@
 import java.util.List;
 import java.util.Map;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.MenuPanel;
@@ -14,7 +17,6 @@
 import org.mule.galaxy.web.client.PageManager;
 import org.mule.galaxy.web.client.WidgetHelper;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
 
 import com.extjs.gxt.ui.client.data.BaseTreeLoader;
 import com.extjs.gxt.ui.client.data.BaseTreeModel;
@@ -48,14 +50,18 @@
     private BaseTreeModel root;
     protected Map<String,ModelData> idToData  = new HashMap<String,ModelData>();
     private String itemId;
+    private final RepositoryModule repository;
+    private RegistryServiceAsync registryService;
 
-    public RepositoryMenuPanel(Galaxy galaxy) {
+    public RepositoryMenuPanel(RepositoryModule repository) {
         super();
-        this.galaxy = galaxy;
+        this.repository = repository;
+        this.registryService = repository.getRegistryService();
+        this.galaxy = repository.getGalaxy();
 
         createPageInfo("browse", new ChildItemsPanel(galaxy, this, null));
-        createPageInfo("item/" + PageManager.WILDCARD, new ItemPanel(galaxy, this));
-        createPageInfo("add-item", new AddItemForm(galaxy, this));
+        createPageInfo("item/" + PageManager.WILDCARD, new ItemPanel(this));
+        createPageInfo("add-item", new AddItemForm(this));
         
         setId("repositoryTabBody");
     }
@@ -76,7 +82,7 @@
                         }
                     }
                 };
-                galaxy.getRegistryService().getItemInfo(itemId, true, getItemCallback);
+                registryService.getItemInfo(itemId, true, getItemCallback);
                 
                 loadItems(itemId);
             } else {
@@ -97,9 +103,8 @@
                 loadAndExpandItems(items);
             }
         };
-        galaxy.getRegistryService().getItems(itemId, true, getItemsCallback);
+        repository.getRegistryService().getItems(itemId, true, getItemsCallback);
     }
-
     
     protected void loadAndExpandItems(Collection<ItemInfo> items) {
         TreeModel parent = root;
@@ -269,7 +274,7 @@
                 final TreeModel parent = (TreeModel) be.getItem();
                 
                 String id = (String)parent.get("id");
-                galaxy.getRegistryService().getItems(id, false, new AbstractCallback<Collection<ItemInfo>>(RepositoryMenuPanel.this) {
+                repository.getRegistryService().getItems(id, false, new AbstractCallback<Collection<ItemInfo>>(RepositoryMenuPanel.this) {
                     public void onSuccess(Collection<ItemInfo> items) {
                         mergeItems(items, parent);
                     }
@@ -317,7 +322,7 @@
     }
 
     public void createPageInfo(String token, final WidgetHelper composite) {
-        PageInfo page = new PageInfo(token, getGalaxy().getRepositoryTab()) {
+        PageInfo page = new PageInfo(token, repository.getRepositoryTab()) {
 
             public AbstractShowable createInstance() {
                 return null;
@@ -336,6 +341,10 @@
         return galaxy;
     }
 
+    public RepositoryModule getRepositoryModule() {
+        return repository;
+    }
+
     public TreeStore<ModelData> getStore() {
         return store;
     }

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractListRenderer.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/AbstractListRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractListRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,7 +1,11 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.mule.galaxy.repository.client.RepositoryModule;
 import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
 
 import com.google.gwt.event.dom.client.ClickEvent;
@@ -11,10 +15,6 @@
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Encapsulate a list of properties that is always editable.
  */
@@ -49,8 +49,8 @@
 
     @SuppressWarnings("unchecked")
     @Override
-    public void initialize(Galaxy galaxy, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
-        super.initialize(galaxy, errorPanel, value, bulkEdit);
+    public void initialize(RepositoryModule repositoryModule, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
+        super.initialize(repositoryModule, errorPanel, value, bulkEdit);
 
         values = new ArrayList<Object>();
         if (value != null) {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractPropertyRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/AbstractPropertyRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/AbstractPropertyRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,22 +1,25 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
-import com.google.gwt.user.client.ui.Widget;
-
 import java.io.Serializable;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
 import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 
+import com.google.gwt.user.client.ui.Widget;
+
 public abstract class AbstractPropertyRenderer {
-    protected Galaxy galaxy;
+    protected RepositoryModule repositoryModule;
     protected ErrorPanel errorPanel;
     protected Object value;
     protected boolean bulkEdit;
     protected boolean editSupported = true;
+    protected RegistryServiceAsync registryService;
     
-    public void initialize(Galaxy galaxy, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
-        this.galaxy = galaxy;
+    public void initialize(RepositoryModule repositoryModule, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
+        this.repositoryModule = repositoryModule;
+        this.registryService = repositoryModule.getRegistryService();
         this.errorPanel = errorPanel;
         this.value = value;             
         this.bulkEdit = bulkEdit;
@@ -31,10 +34,7 @@
     public abstract boolean validate();
  
     public void save(String itemId, String name, Serializable valueToSave, AbstractCallback saveCallback) {
-        galaxy.getRegistryService().setProperty(itemId, 
-                                                name, 
-                                                valueToSave, 
-                                                saveCallback);
+        registryService.setProperty(itemId, name, valueToSave, saveCallback);
     }
 
     public boolean isEditSupported() {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/ArtifactRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/ArtifactRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/ArtifactRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import com.google.gwt.user.client.ui.FileUpload;
 import com.google.gwt.user.client.ui.Widget;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EditPropertyPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/EditPropertyPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EditPropertyPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,13 +1,16 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
+import java.io.Serializable;
+
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.admin.PolicyPanel;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPolicyException;
+import org.mule.galaxy.repository.rpc.WProperty;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.admin.PolicyPanel;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.WPolicyException;
-import org.mule.galaxy.web.rpc.WProperty;
 
 import com.extjs.gxt.ui.client.event.Listener;
 import com.extjs.gxt.ui.client.event.MessageBoxEvent;
@@ -20,8 +23,6 @@
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.io.Serializable;
-
 /**
  * Encapsulates the rendering and editing of a property value.
  */
@@ -34,10 +35,11 @@
     protected ErrorPanel errorPanel;
     protected String itemId;
     protected WProperty property;
-    protected Galaxy galaxy;
+    protected RegistryServiceAsync registryService;
     protected ClickListener saveListener;
     protected ClickListener deleteListener;
     protected ClickListener cancelListener;
+    private RepositoryModule repositoryModule;
 
     public EditPropertyPanel(AbstractPropertyRenderer renderer, ErrorPanel errorPanel) {
         super();
@@ -159,7 +161,7 @@
     }
 
     protected void doDelete() {
-        galaxy.getRegistryService().deleteProperty(itemId, property.getName(), new AbstractCallback(errorPanel) {
+        registryService.deleteProperty(itemId, property.getName(), new AbstractCallback(errorPanel) {
 
             public void onSuccess(Object arg0) {
                 deleteListener.onClick(null);
@@ -193,7 +195,7 @@
                 if (caught instanceof WPolicyException) {
                     WPolicyException pe = (WPolicyException) caught;
 
-                    PolicyPanel.handlePolicyFailure(galaxy, pe);
+                    PolicyPanel.handlePolicyFailure(repositoryModule.getGalaxy(), pe);
                 } else {
                     onSaveFailure(caught, this);
                 }
@@ -221,7 +223,7 @@
     }
 
     private void initializeRenderer() {
-        renderer.initialize(galaxy, errorPanel, property.getValue(), false);
+        renderer.initialize(repositoryModule, errorPanel, property.getValue(), false);
     }
 
     protected void onSaveFailure(Throwable caught, AbstractCallback saveCallback) {
@@ -237,10 +239,6 @@
         this.property = property;
     }
 
-    public void setGalaxy(Galaxy galaxy) {
-        this.galaxy = galaxy;
-    }
-
     public void setErrorPanel(ErrorPanel errorPanel) {
         this.errorPanel = errorPanel;
     }
@@ -269,4 +267,8 @@
     public void setCancelListener(ClickListener cancelListener) {
         this.cancelListener = cancelListener;
     }
+
+    public void setRepositoryModule(RepositoryModule repositoryModule) {
+        this.repositoryModule = repositoryModule;
+    }
 }

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EntryMetadataPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/EntryMetadataPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/EntryMetadataPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,8 +16,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
+import java.util.Collection;
+
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WProperty;
+import org.mule.galaxy.web.client.AbstractShowable;
+import org.mule.galaxy.web.client.ErrorPanel;
+import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.web.client.util.InlineFlowPanel;
+import org.mule.galaxy.web.rpc.AbstractCallback;
+
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.FlexTable;
@@ -27,17 +39,6 @@
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.Collection;
-
-import org.mule.galaxy.web.client.AbstractShowable;
-import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WProperty;
-
 /**
  * Shows all the artifact metadata.
  */
@@ -50,14 +51,18 @@
     private Hyperlink showAll;
     private final Galaxy galaxy;
     private ItemInfo item;
+    private final RepositoryModule repositoryModule;
+    private RegistryServiceAsync service;
     
-    public EntryMetadataPanel(final Galaxy galaxy,
+    public EntryMetadataPanel(final RepositoryModule repository,
                               final ErrorPanel registryPanel,
                               final String title,
                               final ItemInfo item,
                               final boolean stale) {
         super();
-        this.galaxy = galaxy;
+        this.repositoryModule = repository;
+        this.galaxy = repository.getGalaxy();
+        this.service = repository.getRegistryService();
         this.errorPanel = registryPanel;
         this.item = item;
         
@@ -84,9 +89,9 @@
             addMetadata.addClickListener(new ClickListener() {
     
                 public void onClick(Widget arg0) {
-                    NewPropertyPanel edit = new NewPropertyPanel(galaxy,
+                    NewPropertyPanel edit = new NewPropertyPanel(repositoryModule,
                                                                  errorPanel,
-                                                                 galaxy.getRegistryService(),
+                                                                 service,
                                                                  item.getId(),
                                                                  metadata,
                                                                  amPanel,
@@ -119,8 +124,7 @@
             showAll.setText("Show All");
         }
         
-        RegistryServiceAsync svc = galaxy.getRegistryService();
-        svc.getItemInfo(item.getId(), showHidden, new AbstractCallback<ItemInfo>(errorPanel) {
+        service.getItemInfo(item.getId(), showHidden, new AbstractCallback<ItemInfo>(errorPanel) {
 
             public void onSuccess(ItemInfo o) {
                 item = o;
@@ -138,11 +142,11 @@
     public void addRow(WProperty property) {
 
         final AbstractPropertyRenderer renderer = 
-            galaxy.getPropertyInterfaceManager().createRenderer(property.getExtension(), property.isMultiValued());
+            repositoryModule.getPropertyInterfaceManager().createRenderer(property.getExtension(), property.isMultiValued());
 
         EditPropertyPanel render = new EditPropertyPanel(renderer, errorPanel);
         render.setProperty(property);
-        render.setGalaxy(galaxy);
+        render.setRepositoryModule(repositoryModule);
         render.setItemId(item.getId());
         render.initialize();
         render.showView();

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LifecycleRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/LifecycleRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LifecycleRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.FlexTable;
@@ -11,10 +11,10 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.repository.rpc.WPhase;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.WLifecycle;
-import org.mule.galaxy.web.rpc.WPhase;
 
 public class LifecycleRenderer extends AbstractPropertyRenderer {
 
@@ -30,7 +30,7 @@
         lifecycleTable = AbstractShowable.createColumnTable();
         
         if (lifecycles == null) {
-            galaxy.getRegistryService().getLifecycles(new AbstractCallback(errorPanel) {
+            registryService.getLifecycles(new AbstractCallback(errorPanel) {
                 public void onSuccess(Object o) {
                     lifecycles = (Collection) o;
                     doShowLifecycles();
@@ -64,7 +64,7 @@
     public void loadRemote() {
         final List<String> ids = (List<String>) value;
         if (ids != null) {
-            galaxy.getRegistryService().getLifecycle(ids.get(0), new AbstractCallback(errorPanel) {
+            registryService.getLifecycle(ids.get(0), new AbstractCallback(errorPanel) {
     
                 public void onSuccess(Object o) {
                     lifecycle = (WLifecycle) o;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LinksRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/LinksRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/LinksRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,19 +1,19 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.util.ItemPathOracle;
+import org.mule.galaxy.repository.rpc.WLinks;
 import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.util.ItemPathOracle;
 import org.mule.galaxy.web.client.validation.Validator;
 import org.mule.galaxy.web.client.validation.ui.ValidatableSuggestBox;
 import org.mule.galaxy.web.rpc.AbstractCallback;
 import org.mule.galaxy.web.rpc.LinkInfo;
-import org.mule.galaxy.web.rpc.WLinks;
 
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.ui.Button;
@@ -35,8 +35,9 @@
     private Label verifyLabel;
 
     @Override
-    public void initialize(Galaxy galaxy, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
-        this.galaxy = galaxy;
+    public void initialize(RepositoryModule repositoryModule, ErrorPanel errorPanel, Object value, boolean bulkEdit) {
+        this.repositoryModule = repositoryModule;
+        this.registryService = repositoryModule.getRegistryService();
         this.errorPanel = errorPanel;
         this.value = value;
         
@@ -100,7 +101,7 @@
             }
         };
         
-        suggest = new ValidatableSuggestBox(validator, new ItemPathOracle(galaxy, errorPanel, true, "xxx"));
+        suggest = new ValidatableSuggestBox(validator, new ItemPathOracle(registryService, errorPanel, true, "xxx"));
         addPanel.add(suggest);
 
         addButton = new Button();
@@ -124,7 +125,7 @@
     protected void verify(final String path) {
         setEnabled(false);
         
-        galaxy.getRegistryService().itemExists(path, new AbstractCallback<Boolean>(errorPanel) {
+        registryService.itemExists(path, new AbstractCallback<Boolean>(errorPanel) {
 
             public void onSuccess(Boolean exists) {
                 if (isDuplicate(path)) {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/MapRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/MapRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/MapRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/NewPropertyPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/NewPropertyPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/NewPropertyPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,8 +16,22 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.mule.galaxy.repository.client.RepositoryModule;
+import org.mule.galaxy.repository.client.util.PropertyDescriptorComparator;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WProperty;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.web.client.ErrorPanel;
+import org.mule.galaxy.web.client.Galaxy;
+import org.mule.galaxy.web.client.util.InlineFlowPanel;
+import org.mule.galaxy.web.rpc.AbstractCallback;
+
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.ClickListener;
@@ -30,19 +44,6 @@
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
 
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.mule.galaxy.web.client.ErrorPanel;
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.util.InlineFlowPanel;
-import org.mule.galaxy.web.client.util.PropertyDescriptorComparator;
-import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WProperty;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
-
 public class NewPropertyPanel extends Composite {
 
     private ListBox propertiesBox;
@@ -53,20 +54,20 @@
     private Panel propertiesPanel;
     private ClickListener cancelListener;
     private List propertyDescriptors;
-    private final Galaxy galaxy;
     private WProperty property;
     private Button cancelButton;
     private FlexTable panel;
     private InlineFlowPanel selectorPanel;
+    private final RepositoryModule repositoryModule;
 
-    public NewPropertyPanel(final Galaxy galaxy,
+    public NewPropertyPanel(final RepositoryModule repositoryModule,
                             final ErrorPanel registryPanel, 
                             final RegistryServiceAsync registryService,
                             final String itemId,
                             final Panel propertiesPanel,
                             final EntryMetadataPanel metadataPanel,
                             final FlexTable table) {
-        this.galaxy = galaxy;
+        this.repositoryModule = repositoryModule;
         this.errorPanel = registryPanel;
         this.itemId = itemId;
         this.propertiesPanel = propertiesPanel; 
@@ -131,13 +132,13 @@
         WPropertyDescriptor pd = getPropertyDescriptor(txt);
 
         AbstractPropertyRenderer renderer = 
-            galaxy.getPropertyInterfaceManager().createRenderer(pd.getExtension(), pd.isMultiValued());
+            repositoryModule.getPropertyInterfaceManager().createRenderer(pd.getExtension(), pd.isMultiValued());
         
         EditPropertyPanel render = new EditPropertyPanel(renderer, errorPanel);
         property = new WProperty(pd.getName(), pd.getDescription(), null, pd.getExtension(), false);
         property.setMultiValued(pd.isMultiValued());
         render.setProperty(property);
-        render.setGalaxy(galaxy);
+        render.setRepositoryModule(repositoryModule);
         render.setItemId(itemId);
         render.setErrorPanel(errorPanel);
         render.setSaveListener(new ClickListener() {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/PropertyInterfaceManager.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/PropertyInterfaceManager.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/PropertyInterfaceManager.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 
 /**

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleListRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/SimpleListRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleListRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import java.util.Collection;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/SimpleRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/SimpleRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/UserListRenderer.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/property/UserListRenderer.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/property/UserListRenderer.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.property;
+package org.mule.galaxy.repository.client.property;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -26,7 +26,7 @@
         userLB.addItem("Loading...");
         
         if (users == null) { 
-            galaxy.getSecurityService().getUsers(new AbstractCallback(errorPanel) {
+            repositoryModule.getGalaxy().getSecurityService().getUsers(new AbstractCallback(errorPanel) {
     
                 public void onSuccess(Object o) {
                     users = (Collection) o;

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/AddItemHelper.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/AddItemHelper.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/AddItemHelper.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 
 import java.io.Serializable;
@@ -7,12 +7,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.mule.galaxy.web.client.Galaxy;
-import org.mule.galaxy.web.client.property.AbstractPropertyRenderer;
-import org.mule.galaxy.web.client.property.ArtifactRenderer;
+import org.mule.galaxy.repository.client.property.AbstractPropertyRenderer;
+import org.mule.galaxy.repository.client.property.ArtifactRenderer;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.WType;
 
 import com.google.gwt.user.client.ui.FormPanel;
 
@@ -32,7 +32,6 @@
         ARTIFACT, ARTIFACT_VERSION, VERSION, VERSION_TYPE
     }
 
-    private final Galaxy galaxy;
     private String typeId;
     private String versionTypeId;
     private boolean addVersion;
@@ -46,10 +45,11 @@
     private String fileId;
     private AbstractCallback callback;
     protected Map<String, WType> types;
+    private final RegistryServiceAsync registryService;
 
 
-    public AddItemHelper(Galaxy galaxy) {
-        this.galaxy = galaxy;
+    public AddItemHelper(RegistryServiceAsync registryService) {
+        this.registryService = registryService;
         this.setEncoding(FormPanel.ENCODING_MULTIPART);
         this.setMethod(FormPanel.METHOD_POST);
     }
@@ -75,7 +75,7 @@
         Map<String, Serializable> properties = getProperties(this.getRenderers());
 
         if (this.isAddVersion()) {
-            this.galaxy.getRegistryService().addVersionedItem(parent,
+            registryService.addVersionedItem(parent,
                     name,
                     version,
                     null,
@@ -85,7 +85,7 @@
                     getProperties(this.getVersionRenderers()),
                     callback);
         } else {
-            this.galaxy.getRegistryService().addItem(parent,
+            registryService.addItem(parent,
                     name,
                     null,
                     getTypeId(),
@@ -133,7 +133,7 @@
     }
 
     public ItemInfo fetchAndSetItem(String itemId) {
-        galaxy.getRegistryService().getItemInfo(itemId, false, new AbstractCallback<ItemInfo>(null) {
+        registryService.getItemInfo(itemId, false, new AbstractCallback<ItemInfo>(null) {
             public void onSuccess(ItemInfo item) {
                 AddItemHelper.this.setItem(item);
             }
@@ -143,7 +143,7 @@
 
 
     public Map<String, WType> getTypes() {
-        galaxy.getRegistryService().getTypes(new AbstractCallback<List<WType>>(null) {
+        registryService.getTypes(new AbstractCallback<List<WType>>(null) {
             public void onSuccess(List<WType> wtypes) {
                 Collections.sort(wtypes, new WTypeComparator());
                 AddItemHelper.this.types = new HashMap<String, WType>();

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/ItemPathOracle.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/ItemPathOracle.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/ItemPathOracle.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,4 +1,4 @@
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import com.google.gwt.user.client.ui.SuggestOracle;
 
@@ -6,36 +6,37 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.client.Galaxy;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.ItemInfo;
 
 public class ItemPathOracle extends SuggestOracle {
 
-    private Galaxy galaxy;
     private ErrorPanel errorPanel;
     private final String exclude;
     private final String[] types;
     private boolean recursive;
+    private final RegistryServiceAsync registryService;
     
-    public ItemPathOracle(Galaxy galaxy, ErrorPanel errorPanel, boolean recursive, String exclude, String... types) {
-        super();    
+    public ItemPathOracle(RegistryServiceAsync registryService, ErrorPanel errorPanel, boolean recursive, String exclude, String... types) {
+        super();
+        this.registryService = registryService;    
         this.errorPanel = errorPanel;
-        this.galaxy = galaxy;
         this.recursive = recursive;
         this.exclude = exclude;
         this.types = types;
     }
 
-    public ItemPathOracle(Galaxy galaxy, ErrorPanel errorPanel) {
-        this(galaxy, errorPanel, true, "xxx", new String[0]);
+    public ItemPathOracle(RegistryServiceAsync registryService, ErrorPanel errorPanel) {
+        this(registryService, errorPanel, true, "xxx", new String[0]);
     }
 
 
     @Override
     public void requestSuggestions(final Request request, final Callback callback) {
-        galaxy.getRegistryService().suggestItems(request.getQuery(), recursive, exclude,
+        registryService.suggestItems(request.getQuery(), recursive, exclude,
             types, new AbstractCallback<Collection<ItemInfo>>(errorPanel) {
 
             public void onSuccess(Collection<ItemInfo> entries) {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/LifecycleSelectionPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/LifecycleSelectionPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/LifecycleSelectionPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.ChangeListener;
@@ -28,12 +28,12 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.repository.rpc.WPhase;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WLifecycle;
-import org.mule.galaxy.web.rpc.WPhase;
 
 public class LifecycleSelectionPanel extends AbstractShowable {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PolicySelectionPanel.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/PolicySelectionPanel.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PolicySelectionPanel.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ChangeListener;
@@ -33,11 +33,11 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.WPolicy;
 import org.mule.galaxy.web.client.AbstractShowable;
 import org.mule.galaxy.web.client.ErrorPanel;
 import org.mule.galaxy.web.rpc.AbstractCallback;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
-import org.mule.galaxy.web.rpc.WPolicy;
 
 public class PolicySelectionPanel extends AbstractShowable{

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PropertyDescriptorComparator.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/PropertyDescriptorComparator.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/PropertyDescriptorComparator.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import java.util.Comparator;
 
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
 
 public class PropertyDescriptorComparator implements Comparator<WPropertyDescriptor> {

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/RegistryOracle.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/RegistryOracle.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/RegistryOracle.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,10 +1,11 @@
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.mule.galaxy.web.rpc.ItemInfo;
-import org.mule.galaxy.web.rpc.RegistryServiceAsync;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryServiceAsync;
+import org.mule.galaxy.web.client.util.Oracle;
 
 import com.extjs.gxt.ui.client.data.BaseModelData;
 import com.extjs.gxt.ui.client.data.BasePagingLoadResult;

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/StylizedSortableGrid.java (from rev 2109, branches/product_cleanup/gwt-client/src/main/java/org/mule/galaxy/web/client/util/StylizedSortableGrid.java) (0 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/StylizedSortableGrid.java	                        (rev 0)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/StylizedSortableGrid.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,162 @@
+package org.mule.galaxy.repository.client.util;
+
+import com.google.gwt.gen2.table.client.SortableGrid;
+import com.google.gwt.gen2.table.client.TableModelHelper.ColumnSortList;
+import com.google.gwt.gen2.table.event.client.RowHighlightEvent;
+import com.google.gwt.gen2.table.event.client.RowHighlightHandler;
+import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
+import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
+import com.google.gwt.gen2.table.event.client.RowUnhighlightEvent;
+import com.google.gwt.gen2.table.event.client.RowUnhighlightHandler;
+import com.google.gwt.gen2.table.event.client.TableEvent.Row;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
+
+public class StylizedSortableGrid extends SortableGrid {
+
+    public StylizedSortableGrid(int rows, int columns) {
+        super(rows, columns);
+
+        setCellSpacing(0);
+        setCellPadding(4);
+
+        addRowHighlightHandler(new RowHighlightHandler() {
+            public void onRowHighlight(RowHighlightEvent event) {
+                int idx = event.getValue().getRowIndex();
+                if (idx == 0)
+                    return;
+                getRowFormatter().setStyleName(idx, "SortableGrid-selectedRow");
+            }
+        });
+        addRowUnhighlightHandler(new RowUnhighlightHandler() {
+            public void onRowUnhighlight(RowUnhighlightEvent event) {
+                int idx = event.getValue().getRowIndex();
+                if (idx == 0 || getSelectedRows().contains(idx))
+                    return;
+
+                getRowFormatter().setStyleName(idx, "");
+            }
+        });
+        addRowSelectionHandler(new RowSelectionHandler() {
+
+            public void onRowSelection(RowSelectionEvent event) {
+                for (Row row : event.getDeselectedRows()) {
+                    int idx = row.getRowIndex();
+                    if (idx == 0)
+                        return;
+
+                    getRowFormatter().setStyleName(idx, "");
+                }
+
+                for (Row row : event.getSelectedRows()) {
+                    int idx = row.getRowIndex();
+                    if (idx == 0)
+                        return;
+
+                    getRowFormatter().setStyleName(idx, "SortableGrid-selectedRow");
+                }
+            }
+        });
+
+        setColumnSorter(new ColumnSorter() {
+
+            @Override
+            public void onSortColumn(SortableGrid grid, ColumnSortList sortList,
+                                     SortableGrid.ColumnSorterCallback callback) {
+                // Get the primary column and sort order
+                int column = sortList.getPrimaryColumn();
+                boolean ascending = sortList.isPrimaryAscending();
+
+                // Apply the default quicksort algorithm
+                SelectionGridCellFormatter formatter = grid.getSelectionGridCellFormatter();
+                Element[] tdElems = new Element[grid.getRowCount()];
+                for (int i = 0; i < tdElems.length; i++) {
+                    tdElems[i] = formatter.getElement(i, column);
+                }
+                
+                Element[] nonHeaders = new Element[tdElems.length-1];
+                
+                for (int i = 1; i < tdElems.length; i++) {
+                    nonHeaders[i-1] = tdElems[i];
+                }
+                
+                quicksort(nonHeaders, 0, nonHeaders.length - 1);
+
+                for (int i = 1; i < tdElems.length; i++) {
+                    tdElems[i] = nonHeaders[i-1];
+                }
+                
+                // Convert tdElems to trElems, reversing if needed
+                Element[] trElems = new Element[tdElems.length];
+                trElems[0] = DOM.getParent(tdElems[0]);
+                if (ascending) {
+                    for (int i = 1; i < tdElems.length; i++) {
+                        trElems[i] = DOM.getParent(tdElems[i]);
+                    }
+                } else {
+                    int maxElem = tdElems.length - 1;
+                    for (int i = 1; i <= maxElem; i++) {
+                        trElems[i] = DOM.getParent(tdElems[maxElem - i + 1]);
+                    }
+                }
+
+                // Use the callback to complete the sorting
+                callback.onSortingComplete(trElems);
+            }
+
+            /**
+             * Recursive quicksort algorithm.
+             * 
+             * @param tdElems
+             *            an array of row elements
+             * @param start
+             *            the start index to sort
+             * @param end
+             *            the last index to sort
+             */
+            private void quicksort(Element[] tdElems, int start, int end) {
+                // No need to sort
+                if (start >= end) {
+                    return;
+                }
+
+                // Sort this set
+                int i = start + 1;
+                int k = end;
+                String pivot = DOM.getInnerText(tdElems[start]);
+                while (k >= i) {
+                    if (DOM.getInnerText(tdElems[i]).compareTo(pivot) < 0) {
+                        // Move i until the value is great than the pivot
+                        i++;
+                    } else if (k == i) {
+                        // Don't swap if equal
+                        k--;
+                    } else if (DOM.getInnerText(tdElems[k]).compareTo(pivot) < 0) {
+                        // Swap the elements at k and i
+                        Element tr = tdElems[i];
+                        tdElems[i] = tdElems[k];
+                        tdElems[k] = tr;
+                        i++;
+                        k--;
+                    } else {
+                        // Decrement k
+                        k--;
+                    }
+                }
+
+                // Swap k and pivot
+                if (k != start) {
+                    Element tr = tdElems[k];
+                    tdElems[k] = tdElems[start];
+                    tdElems[start] = tr;
+                }
+
+                // Sort the subsets
+                quicksort(tdElems, start, k - 1);
+                quicksort(tdElems, k + 1, end);
+            }
+        });
+
+    }
+
+}

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/WTypeComparator.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/client/util/WTypeComparator.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/client/util/WTypeComparator.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.mule.galaxy.web.client.util;
+package org.mule.galaxy.repository.client.util;
 
 import java.util.Comparator;
 
-import org.mule.galaxy.web.rpc.WType;
+import org.mule.galaxy.repository.rpc.WType;
 
 public class WTypeComparator implements Comparator<WType> {

Copied: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc (from rev 2110, branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc) ( => )

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/ItemInfo.java
===================================================================
--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/ItemInfo.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/ItemInfo.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import java.util.ArrayList;
 import java.util.Collection;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryService.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/RegistryService.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryService.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -26,6 +26,10 @@
 import java.util.Set;
 
 import org.mule.galaxy.web.client.RPCException;
+import org.mule.galaxy.web.rpc.ItemExistsException;
+import org.mule.galaxy.web.rpc.ItemNotFoundException;
+import org.mule.galaxy.web.rpc.SearchPredicate;
+import org.mule.galaxy.web.rpc.WActivity;
 
 import com.google.gwt.user.client.rpc.RemoteService;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryServiceAsync.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/RegistryServiceAsync.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/RegistryServiceAsync.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,14 +16,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import java.io.Serializable;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.mule.galaxy.web.rpc.SearchPredicate;
+
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
 public interface RegistryServiceAsync {
@@ -174,4 +177,14 @@
     void deleteArtifactView(String id, AsyncCallback callback);
     
     void getRecentArtifactViews(AsyncCallback callback);
+
+    void getActivities(Date from, 
+                       Date to, 
+                       String user,
+                       String itemPath,
+                       String text,
+                       String eventTypeStr, int start,
+                       int results, 
+                       boolean ascending,
+                       AsyncCallback callback);
 }
\ No newline at end of file

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WApprovalMessage.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WApprovalMessage.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WApprovalMessage.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactType.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WArtifactType.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactType.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.extjs.gxt.ui.client.data.BeanModelTag;
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactView.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WArtifactView.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WArtifactView.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,10 +1,12 @@
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import org.mule.galaxy.web.rpc.SearchPredicate;
+
 public class WArtifactView implements IsSerializable {
     private String id;
     private String name;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WComment.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WComment.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WComment.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WGovernanceInfo.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WGovernanceInfo.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WGovernanceInfo.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WIndex.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WIndex.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WIndex.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 import com.extjs.gxt.ui.client.data.BeanModelTag;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLifecycle.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WLifecycle.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLifecycle.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 import com.extjs.gxt.ui.client.data.BeanModelTag;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLinks.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WLinks.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WLinks.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,10 +1,12 @@
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 
 import java.io.Serializable;
 import java.util.List;
 
+import org.mule.galaxy.web.rpc.LinkInfo;
+
 public class WLinks implements IsSerializable, Serializable {
     private List<LinkInfo> links;
     private List<LinkInfo> reciprocal;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPhase.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WPhase.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPhase.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
 import com.extjs.gxt.ui.client.data.BeanModelTag;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicy.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WPolicy.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicy.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicyException.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WPolicyException.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPolicyException.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WProperty.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WProperty.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WProperty.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPropertyDescriptor.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WPropertyDescriptor.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WPropertyDescriptor.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import com.extjs.gxt.ui.client.data.BeanModelTag;
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WSearchResults.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WSearchResults.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WSearchResults.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WType.java (2110 => 2111)

--- branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/web/rpc/WType.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/gwt-client/src/main/java/org/mule/galaxy/repository/rpc/WType.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,6 +1,6 @@
-package org.mule.galaxy.web.rpc;
+package org.mule.galaxy.repository.rpc;
 
-import org.mule.galaxy.web.client.util.PropertyDescriptorComparator;
+import org.mule.galaxy.repository.client.util.PropertyDescriptorComparator;
 
 import com.extjs.gxt.ui.client.data.BeanModelTag;
 import com.google.gwt.user.client.rpc.IsSerializable;

Modified: branches/product_cleanup/repository/server/pom.xml (2110 => 2111)

--- branches/product_cleanup/repository/server/pom.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/server/pom.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -28,7 +28,7 @@
 
         <dependency>
             <groupId>org.mule.galaxy</groupId>
-            <artifactId>galaxy-repository-client</artifactId>
+            <artifactId>galaxy-repository-gwt-client</artifactId>
             <version>${version}</version>
         </dependency>

Copied: branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/RegistryServiceImpl.java (from rev 2110, branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/server/RegistryServiceImpl.java) (0 => 2111)

--- branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/RegistryServiceImpl.java	                        (rev 0)
+++ branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/repository/RegistryServiceImpl.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,2094 @@
+/*
+ * $Id: ContextPathResolver.java 794 2008-04-23 22:23:10Z andrew $
+ * --------------------------------------------------------------------------------------
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.mule.galaxy.repository;
+
+import java.io.FileNotFoundException;
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+
+import org.acegisecurity.context.SecurityContextHolder;
+import org.apache.abdera.i18n.text.UrlEncoding;
+import org.apache.abdera.i18n.text.CharUtils.Profile;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.mule.galaxy.DuplicateItemException;
+import org.mule.galaxy.Item;
+import org.mule.galaxy.Link;
+import org.mule.galaxy.Links;
+import org.mule.galaxy.NotFoundException;
+import org.mule.galaxy.PropertyException;
+import org.mule.galaxy.PropertyInfo;
+import org.mule.galaxy.Registry;
+import org.mule.galaxy.RegistryException;
+import org.mule.galaxy.activity.Activity;
+import org.mule.galaxy.activity.ActivityManager;
+import org.mule.galaxy.activity.ActivityManager.EventType;
+import org.mule.galaxy.artifact.ArtifactType;
+import org.mule.galaxy.artifact.ArtifactTypeDao;
+import org.mule.galaxy.collab.Comment;
+import org.mule.galaxy.collab.CommentManager;
+import org.mule.galaxy.event.EventManager;
+import org.mule.galaxy.extension.Extension;
+import org.mule.galaxy.impl.artifact.ArtifactExtension;
+import org.mule.galaxy.impl.artifact.UploadService;
+import org.mule.galaxy.impl.jcr.UserDetailsWrapper;
+import org.mule.galaxy.impl.lifecycle.LifecycleExtension;
+import org.mule.galaxy.impl.link.LinkExtension;
+import org.mule.galaxy.index.Index;
+import org.mule.galaxy.index.IndexManager;
+import org.mule.galaxy.lifecycle.Lifecycle;
+import org.mule.galaxy.lifecycle.LifecycleManager;
+import org.mule.galaxy.lifecycle.Phase;
+import org.mule.galaxy.policy.ApprovalMessage;
+import org.mule.galaxy.policy.Policy;
+import org.mule.galaxy.policy.PolicyException;
+import org.mule.galaxy.policy.PolicyManager;
+import org.mule.galaxy.query.OpRestriction;
+import org.mule.galaxy.query.Query;
+import org.mule.galaxy.query.QueryException;
+import org.mule.galaxy.query.Restriction;
+import org.mule.galaxy.query.SearchResults;
+import org.mule.galaxy.query.OpRestriction.Operator;
+import org.mule.galaxy.render.ItemRenderer;
+import org.mule.galaxy.render.RendererManager;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryService;
+import org.mule.galaxy.repository.rpc.WApprovalMessage;
+import org.mule.galaxy.repository.rpc.WArtifactType;
+import org.mule.galaxy.repository.rpc.WArtifactView;
+import org.mule.galaxy.repository.rpc.WComment;
+import org.mule.galaxy.repository.rpc.WIndex;
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.repository.rpc.WLinks;
+import org.mule.galaxy.repository.rpc.WPhase;
+import org.mule.galaxy.repository.rpc.WPolicy;
+import org.mule.galaxy.repository.rpc.WPolicyException;
+import org.mule.galaxy.repository.rpc.WProperty;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.rpc.WSearchResults;
+import org.mule.galaxy.repository.rpc.WType;
+import org.mule.galaxy.security.AccessControlManager;
+import org.mule.galaxy.security.AccessException;
+import org.mule.galaxy.security.Permission;
+import org.mule.galaxy.security.User;
+import org.mule.galaxy.security.UserManager;
+import org.mule.galaxy.type.PropertyDescriptor;
+import org.mule.galaxy.type.Type;
+import org.mule.galaxy.type.TypeManager;
+import org.mule.galaxy.util.SecurityUtils;
+import org.mule.galaxy.util.UserUtils;
+import org.mule.galaxy.view.ArtifactViewManager;
+import org.mule.galaxy.view.View;
+import org.mule.galaxy.web.ContextPathResolver;
+import org.mule.galaxy.web.client.RPCException;
+import org.mule.galaxy.web.rpc.ItemExistsException;
+import org.mule.galaxy.web.rpc.ItemNotFoundException;
+import org.mule.galaxy.web.rpc.LinkInfo;
+import org.mule.galaxy.web.rpc.SearchPredicate;
+import org.mule.galaxy.web.rpc.WActivity;
+
+public class RegistryServiceImpl implements RegistryService {
+
+    protected static final String DEFAULT_DATETIME_FORMAT = "h:mm a, MMMM d, yyyy";
+
+    private static final String RECENT_VIEWS = "recent.artifactViews";
+
+    private final Log log = LogFactory.getLog(getClass());
+
+    private Registry registry;
+    private ArtifactTypeDao artifactTypeDao;
+    private RendererManager rendererManager;
+    private PolicyManager policyManager;
+    private IndexManager indexManager;
+    private ActivityManager activityManager;
+    private AccessControlManager accessControlManager;
+    private ArtifactViewManager artifactViewManager;
+    private TypeManager typeManager;
+
+    private ContextPathResolver contextPathResolver;
+
+    private LifecycleManager localLifecycleManager;
+
+    private EventManager eventManager;
+
+    private UploadService uploadService;
+
+    private UserManager userManager;
+    
+    public Collection<ItemInfo> getItems(String parentId, boolean traverseUpParents) throws RPCException {
+        try {
+            if (parentId == null) {
+                Collection<Item> items = registry.getItems();
+                
+                return toWeb(items, false);
+            } else {
+                Item w = (Item) registry.getItemById(parentId);
+
+                Collection<ItemInfo> workspaces = null;
+                if (traverseUpParents) {
+                    while (w != null) {
+                        Item parent = w.getParent();
+                        Collection<ItemInfo> parentWorkspaces;
+                        if (parent != null) {
+                            parentWorkspaces = toWeb(parent.getItems(), false);
+                        } else {
+                            parentWorkspaces = toWeb(registry.getItems(), false);
+                        }
+                        
+                        if (workspaces != null) {
+                            addWorkspaces(w.getName(), parentWorkspaces, workspaces);
+                        }
+                        workspaces = parentWorkspaces;
+                        w = parent;
+                    }
+                } else {
+                    workspaces = toWeb(w.getItems(), false);
+                }
+                return workspaces;
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public Collection<ItemInfo> getItemsWithAllChildren(String parentPath) throws RPCException {
+        return getItemsInPath(parentPath, true);
+    }
+
+    public Collection<ItemInfo> getItemsInPath(String parentPath) throws RPCException {
+        return getItemsInPath(parentPath, false);
+    }
+
+    private Collection<ItemInfo> getItemsInPath(String parentPath, boolean populateChildren) throws RPCException {
+        try {
+            if (parentPath == null || "".equals(parentPath) || "/".equals(parentPath)) {
+                return toWeb(registry.getItems(), populateChildren);
+            } else {
+                return toWeb(registry.getItemByPath(parentPath).getItems(), populateChildren);
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    
+    private Collection<ItemInfo> toWeb(Collection<Item> workspaces, boolean populateChildren) throws RegistryException {
+        if (workspaces == null) {
+            return null;
+        }
+        
+        List<ItemInfo> wis = new ArrayList<ItemInfo>();
+        for (Item w : workspaces) {
+            if (!w.isInternal()) {
+                ItemInfo ww = toWeb(w, populateChildren);
+                wis.add(ww);
+            }
+        }
+        
+        return wis;
+    }
+
+    private void addWorkspaces(String name, Collection<ItemInfo> parents, Collection<ItemInfo> children) {
+        for (ItemInfo w : parents) {
+            if (name.equals(w.getName())) {
+                w.setItems(children);
+                return;
+            }
+        }
+    }
+    
+    private ItemInfo toWeb(Item i, boolean populateChildren) throws RegistryException {
+        ItemInfo ii = new ItemInfo();
+        ii.setId(i.getId());
+        ii.setName(i.getName());
+        ii.setPath(i.getPath());
+        if (i.getParent() != null) {
+            ii.setParentPath(i.getParent().getPath());
+        }
+        ii.setLocal(i.isLocal());
+        if (i.getAuthor() != null) {
+            ii.setAuthorName(i.getAuthor().getName());
+            ii.setAuthorUsername(i.getAuthor().getUsername());
+        } else {
+            ii.setAuthorName("[Removed]");
+            ii.setAuthorName("[Removed]");
+        }
+        ii.setType(i.getType().getName());
+        
+        if (populateChildren) {
+            Collection<ItemInfo> children = toWeb(i.getItems(), populateChildren);
+            ii.setItems(children);
+        }
+        return ii;
+    }
+
+    public String addVersionedItem(String parentPath, 
+                                   String name, 
+                                   String versionName, 
+                                   String lifecycleId,
+                                   String typeId, 
+                                   String versionTypeId, 
+                                   Map<String, Serializable> properties,
+                                   Map<String, Serializable> versionProperties) throws RPCException,
+        ItemNotFoundException, ItemExistsException, WPolicyException {
+        addItem(parentPath, name, lifecycleId, typeId, properties);
+        
+        if (!parentPath.endsWith("/")) {
+            parentPath += "/";
+        }
+        parentPath += name;
+        
+        return addItem(parentPath, versionName, lifecycleId, versionTypeId, versionProperties);
+    }
+
+    public String addItem(String parentPath, 
+                          String itemName, 
+                          String lifecycleId, 
+                          String typeId, 
+                          Map<String, Serializable> properties) 
+        throws RPCException, ItemNotFoundException, ItemExistsException, WPolicyException {
+        
+        // If we uploaded files, lets track them so we can delete them
+        ArrayList<String> filesToDelete = new ArrayList<String>();
+        
+        try {
+            Item item;
+            Type type = typeManager.getType(typeId);
+            Map<String, Object> localProperties = new HashMap<String, Object>();
+            if (properties != null) {
+                for (Map.Entry<String, Serializable> e : properties.entrySet()) {
+                    String name = e.getKey();
+                    PropertyDescriptor pd = typeManager.getPropertyDescriptorByName(name);
+                    
+                    localProperties.put(name, getLocalValue(pd, e.getValue(), null));
+                    
+                    if (pd != null && pd.getExtension() instanceof ArtifactExtension) {
+                        filesToDelete.add((String)e.getValue());
+                    }
+                }
+            }
+            
+            if (parentPath == null || "".equals(parentPath) || "/".equals(parentPath)) {
+                item = registry.newItem(itemName, type, localProperties).getItem();
+            } else {
+                Item parent = (Item) registry.getItemByPath(parentPath);
+                
+                if (parent == null) {
+                    throw new RPCException("Could not find parent workspace: " + parentPath);
+                }
+                item = parent.newItem(itemName, type, localProperties).getItem();
+            }
+            if (lifecycleId != null) {
+                item.setDefaultLifecycle(item.getLifecycleManager().getLifecycleById(lifecycleId));
+                registry.save(item);
+            }
+            
+            return item.getId();
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            log.error(e.getMessage(), e);
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        } catch (PropertyException e) {
+            throw new RPCException(e.getMessage());
+        } finally {
+            for (String s : filesToDelete) {
+                uploadService.delete(s);
+            }
+        }
+    }
+
+    public Collection<WArtifactType> getArtifactTypes() {
+        Collection<ArtifactType> artifactTypes = artifactTypeDao.listAll();
+        List<WArtifactType> atis = new ArrayList<WArtifactType>();
+
+        for (ArtifactType a : artifactTypes) {
+            WArtifactType at = toWeb(a);
+            atis.add(at);
+        }
+        return atis;
+    }
+
+    public WArtifactType getArtifactType(String id) throws RPCException {
+        try {
+            return toWeb(artifactTypeDao.get(id));
+        } catch (Exception e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private WArtifactType toWeb(ArtifactType a) {
+        Set<QName> docTypes = a.getDocumentTypes();
+        List<String> docTypesAsStr = new ArrayList<String>();
+        if (docTypes != null) {
+            for (QName q : docTypes) {
+                docTypesAsStr.add(q.toString());
+            }
+        }
+        return new WArtifactType(a.getId(), a.getContentType(),
+                                 a.getDescription(), docTypesAsStr,
+                                 a.getFileExtensions());
+    }
+
+    public void deleteArtifactType(String id) throws RPCException {
+        try {
+            artifactTypeDao.delete(id);
+        } catch (RuntimeException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void saveArtifactType(WArtifactType artifactType) throws RPCException, ItemExistsException {
+        try {
+            ArtifactType at = fromWeb(artifactType);
+            artifactTypeDao.save(at);
+        } catch (RuntimeException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private ArtifactType fromWeb(WArtifactType wat) {
+        ArtifactType at = new ArtifactType();
+        at.setId(wat.getId());
+        at.setDescription(wat.getDescription());
+        at.setContentType(wat.getMediaType());
+        at.setDocumentTypes(fromWeb(wat.getDocumentTypes()));
+
+        HashSet<String> exts = new HashSet<String>();
+        exts.addAll(wat.getFileExtensions());
+        at.setFileExtensions(exts);
+
+        return at;
+    }
+
+    private Set<QName> fromWeb(Collection<String> documentTypes) {
+        if (documentTypes == null) return null;
+
+        Set<QName> s = new HashSet<QName>();
+        for (Object o : documentTypes) {
+            String qn = o.toString();
+            if (qn.startsWith("{}")) {
+                qn = qn.substring(2);
+            }
+
+            s.add(QName.valueOf(qn));
+        }
+        return s;
+    }
+
+    private OpRestriction getRestrictionForPredicate(SearchPredicate pred) {
+        String property = pred.getProperty();
+        String value = pred.getValue();
+        switch (pred.getMatchType()) {
+            case SearchPredicate.HAS_VALUE:
+                return OpRestriction.eq(property, value);
+            case SearchPredicate.LIKE:
+                return OpRestriction.like(property, value);
+            case SearchPredicate.DOES_NOT_HAVE_VALUE:
+                return OpRestriction.not(OpRestriction.eq(property, value));
+            default:
+                return null;
+        }
+    }
+
+    public WSearchResults getArtifacts(String workspaceId, 
+                                       String workspacePath, 
+                                       boolean includeChildWkspcs,
+                                       Set<SearchPredicate> searchPredicates, 
+                                       String freeformQuery,
+                                       int start, int maxResults) throws RPCException {
+        Query q = getQuery(searchPredicates, start, maxResults);
+
+        final String context = contextPathResolver.getContextPath();
+        
+        try {
+            if (workspaceId != null) {
+                Item workspace = ((Item)registry.getItemById(workspaceId));
+                List<Item> items = workspace.getItems();
+                List<Item> trimmedItems = new ArrayList<Item>();
+                for (int i = start; i < start+maxResults && i < items.size(); i++) {
+                    trimmedItems.add(items.get(i));
+                }
+                WSearchResults results = getSearchResults(null, trimmedItems, items.size());
+                results.setQuery("select artifact, entry from '@" + workspaceId + "'");
+                results.setFeed(getLink(context + "/api/registry", workspace));
+                results.setTotal(items.size());
+                return results;
+            } else if (workspacePath != null && !"".equals(workspacePath) && !"/".equals(workspacePath)) {
+                q.fromPath(workspacePath, includeChildWkspcs);
+            }
+            
+            SearchResults results;
+            if (freeformQuery != null && !freeformQuery.equals(""))
+                results = registry.search(freeformQuery, start, maxResults);
+            else
+                results = registry.search(q);
+
+            WSearchResults wr = getSearchResults(null, results.getResults(), results.getTotal());
+            wr.setQuery(q.toString());
+            wr.setFeed(context + "/api/registry?q=" + UrlEncoding.encode(wr.getQuery(), Profile.PATH.filter()));
+            return wr;
+        } catch (QueryException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error("Could not query the registry.", e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public Collection<ItemInfo> suggestItems(String query, boolean recursive, String excludePath, String[] types) throws RPCException {
+        try {
+            SearchResults results = registry.suggest(query, recursive, 10, excludePath, types);
+            
+            ArrayList<ItemInfo> entries = new ArrayList<ItemInfo>();
+            for (Item i : results.getResults()) {
+                entries.add(toWeb(i, false));
+            }
+            return entries;
+        } catch (QueryException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error("Could not query the registry.", e);
+            throw new RPCException(e.getMessage());
+        }
+    }
+    
+    private Query getQuery(Set<SearchPredicate> searchPredicates, int start, int maxResults) {
+        Query q = new Query().orderBy("name");
+
+        q.setMaxResults(maxResults);
+        q.setStart(start);
+        // Filter based on our search terms
+
+        if (searchPredicates != null) {
+            for (Object predObj : searchPredicates) {
+                SearchPredicate pred = (SearchPredicate) predObj;
+                q.add(getRestrictionForPredicate(pred));
+            }
+        }
+        return q;
+    }
+
+    private WSearchResults getSearchResults(String type, 
+                                            Collection<? extends Item> results,
+                                            long total) throws RegistryException {
+
+        WSearchResults wsr = new WSearchResults();
+        ItemRenderer view;
+//        if (type != null) {
+//            view = rendererManager.getRenderer(type);
+//        } else {
+            view = rendererManager.getDefaultRenderer();
+//        }
+
+
+        int col = 0;
+        for (String colName : view.getColumnNames()) {
+            if (view.isSummary(col)) {
+                wsr.getColumns().add(colName);
+            }
+            col++;
+        }
+        
+        for (Item i : results) {
+            wsr.getRows().add(toWeb(i, false));
+        }
+
+        wsr.setTotal(total);
+        return wsr;
+    }
+
+    public WSearchResults getArtifactsForView(String viewId,
+                                              int resultStart,
+                                              int maxResults)
+            throws RPCException {
+        try {
+            View view = artifactViewManager.getArtifactView(viewId);
+            SearchResults result = registry.search(view.getQuery(), resultStart, maxResults);
+            return getSearchResults(null, result.getResults(), result.getTotal());
+        } catch (QueryException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error("Could not query the registry.", e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public void deleteArtifactView(String id) throws RPCException {
+        artifactViewManager.delete(id);
+        // clean up recent views too
+        User user = getCurrentUser();
+        List<String> views = (List<String>) user.getProperties().get(RECENT_VIEWS);
+        boolean wasFound = views.remove(id);
+
+        assert wasFound : "View deleted, but no corresponding Recent Views entry found for " + id;
+    }
+
+    public WArtifactView getArtifactView(String id) throws RPCException, ItemExistsException, ItemNotFoundException {
+        User user = getCurrentUser();
+        try {
+            WArtifactView view = toWeb(artifactViewManager.getArtifactView(id));
+            updateRecentArtifactViews(user, id);
+
+            return view;
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (NotFoundException e) {
+            log.error(e.getMessage(), e);
+            throw new ItemNotFoundException();
+        }
+    }
+
+    private void updateRecentArtifactViews(User user, String id) throws DuplicateItemException, NotFoundException {
+        List<String> recent = getRecentArtifactViewIds(user);
+
+        // remove this id if it alread exists
+        recent.remove(id);
+
+        // add the view to the top of the list
+        recent.add(0, id);
+
+        while (recent.size() > 5) {
+            recent.remove(recent.size() - 1);
+        }
+
+        userManager.save(user);
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<String> getRecentArtifactViewIds(User user) {
+        if (user.getProperties() == null) {
+            user.setProperties(new HashMap<String, Object>());
+        }
+        List<String> recent = (List<String>) user.getProperties().get(RECENT_VIEWS);
+
+        if (recent == null) {
+            recent = new ArrayList<String>();
+            user.getProperties().put(RECENT_VIEWS, recent);
+        }
+        return recent;
+    }
+
+    public Collection<WArtifactView> getArtifactViews() throws RPCException {
+        List<WArtifactView> views = new ArrayList<WArtifactView>();
+        User currentUser = getCurrentUser();
+        for (View v : artifactViewManager.getArtifactViews(currentUser)) {
+            views.add(toWeb(v));
+        }
+
+        Collections.sort(views, new Comparator<WArtifactView>() {
+            public int compare(WArtifactView v1, WArtifactView v2) {
+                return v1.getName().compareTo(v2.getName());
+            }
+        });
+        return views;
+    }
+
+    public Collection<WArtifactView> getRecentArtifactViews() throws RPCException {
+        List<WArtifactView> views = new ArrayList<WArtifactView>();
+        User currentUser = getCurrentUser();
+        List<String> ids = getRecentArtifactViewIds(currentUser);
+        if (ids != null) {
+            for (String id : ids) {
+                try {
+                    views.add(toWeb(artifactViewManager.getArtifactView(id)));
+                } catch (NotFoundException e) {
+                }
+            }
+        }
+        return views;
+    }
+
+    private WArtifactView toWeb(View v) throws RPCException {
+        WArtifactView wv = new WArtifactView();
+        if (v == null) {
+            return wv;
+        }
+        wv.setName(v.getName());
+        wv.setId(v.getId());
+
+        try {
+            if (v.isFreeform()) {
+                wv.setQueryString(v.getQuery());
+            } else {
+                Query q = Query.fromString(v.getQuery());
+    
+                wv.setPredicates(getPredicates(q));
+                wv.setWorkspace(q.getFromPath());
+                wv.setWorkspaceSearchRecursive(q.isFromRecursive());
+            }
+            
+            wv.setShared(v.getUser() == null);
+        } catch (QueryException e) {
+            log.error("Could not parse query. " + e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        }
+        return wv;
+    }
+
+    /**
+     * Convert a string query to a set of search predicates for the SearchForm.
+     * You'll see that we do not have full fidelity yet between text queries and
+     * the actual form. However, that is not a problem as we'll only ever encounter
+     * queries which were created with the form. So there are some cases here
+     * that we don't have to worry about.
+     *
+     * @param q
+     * @return
+     * @throws RPCException
+     */
+    public Set<SearchPredicate> getPredicates(Query q) throws RPCException {
+        Set<SearchPredicate> predicates = new HashSet<SearchPredicate>();
+
+        for (Restriction r : q.getRestrictions()) {
+            if (r instanceof OpRestriction) {
+                OpRestriction op = (OpRestriction) r;
+
+                Object left = op.getLeft();
+                Object right = op.getRight();
+                Operator operator = op.getOperator();
+
+                if (operator.equals(Operator.NOT)) {
+                    if (right instanceof OpRestriction) {
+                        OpRestriction op2 = (OpRestriction) right;
+
+                        predicates.add(new SearchPredicate(op2.getLeft().toString(),
+                                                           SearchPredicate.DOES_NOT_HAVE_VALUE,
+                                                           op2.getRight().toString()));
+                    } else {
+                        throw new RPCException("Query could not be converted.");
+                    }
+                } else if (operator.equals(Operator.EQUALS)) {
+                    predicates.add(new SearchPredicate(left.toString(), SearchPredicate.HAS_VALUE, right.toString()));
+                } else if (operator.equals(Operator.LIKE)) {
+                    predicates.add(new SearchPredicate(left.toString(), SearchPredicate.LIKE, right.toString()));
+                }
+            }
+        }
+        return predicates;
+    }
+
+    public String saveArtifactView(WArtifactView wv) throws RPCException {
+        View v = fromWeb(wv);
+
+        try {
+            artifactViewManager.save(v);
+            return v.getId();
+        } catch (DuplicateItemException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException("Couldn't save view.");
+        } catch (NotFoundException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException("The view being saved has been deleted.");
+        }
+    }
+
+    private View fromWeb(WArtifactView wv) throws RPCException {
+        View v = new View();
+        v.setId(wv.getId());
+        v.setName(wv.getName());
+        if (!wv.isShared()) {
+            v.setUser(getCurrentUser());
+        }
+        
+        if (wv.getQueryString() != null && !"".equals(wv.getQueryString())) {
+            v.setQuery(wv.getQueryString());
+            v.setFreeform(true);
+        } else {
+            Query query = getQuery(wv.getPredicates(), 0, 0);
+            query.fromPath(wv.getWorkspace(), wv.isWorkspaceSearchRecursive());
+    
+            v.setQuery(query.toString());
+            v.setFreeform(false);
+        }
+        
+        return v;
+    }
+
+    public Collection<WIndex> getIndexes() {
+        ArrayList<WIndex> windexes = new ArrayList<WIndex>();
+
+        Collection<Index> indices = indexManager.getIndexes();
+        for (Index idx : indices) {
+            windexes.add(toWeb(idx));
+        }
+
+        return windexes;
+    }
+
+    private WIndex toWeb(Index idx) {
+
+        ArrayList<String> docTypes = new ArrayList<String>();
+        if (idx.getDocumentTypes() != null) {
+            for (QName q : idx.getDocumentTypes()) {
+                docTypes.add(q.toString());
+            }
+        }
+        String qt;
+        if (String.class.equals(idx.getQueryType())) {
+            qt = "String";
+        } else {
+            qt = "QName";
+        }
+
+        return new WIndex(idx.getId(),
+                          idx.getDescription(),
+                          idx.getMediaType(),
+                          idx.getConfiguration().get("property"),
+                          idx.getConfiguration().get("expression"),
+                          idx.getIndexer(),
+                          qt,
+                          docTypes);
+    }
+
+    public WIndex getIndex(String id) throws RPCException {
+        try {
+            Index idx = indexManager.getIndex(id);
+            if (idx == null) {
+                return null;
+            }
+            return toWeb(idx);
+        } catch (Exception e) {
+            throw new RPCException("Could not find index " + id);
+        }
+    }
+
+    public void saveIndex(WIndex wi) throws RPCException {
+        try {
+            Index idx = fromWeb(wi);
+
+            indexManager.save(idx);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException("Couldn't save index.");
+        }
+    }
+
+    public void deleteIndex(String id, boolean removeArtifactMetadata) throws RPCException {
+        try {
+            indexManager.delete(id, removeArtifactMetadata);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException("Couldn't save index.");
+        }
+    }
+
+    private Index fromWeb(WIndex wi) throws RPCException {
+        Index idx = new Index();
+        idx.setId(wi.getId());
+        idx.setConfiguration(new HashMap<String, String>());
+        idx.setIndexer(wi.getIndexer());
+
+        if (idx.getIndexer().contains("Groovy")) {
+            idx.getConfiguration().put("script", wi.getExpression());
+        } else {
+            idx.getConfiguration().put("property", wi.getProperty());
+            idx.getConfiguration().put("expression", wi.getExpression());
+        }
+        idx.setIndexer(wi.getIndexer());
+        idx.setDescription(wi.getDescription());
+        idx.setMediaType(wi.getMediaType());
+
+        if (wi.getResultType().equals("String")) {
+            idx.setQueryType(String.class);
+        } else {
+            idx.setQueryType(QName.class);
+        }
+
+        Set<QName> docTypes = new HashSet<QName>();
+        for (Object o : wi.getDocumentTypes()) {
+            try {
+                docTypes.add(QName.valueOf(o.toString()));
+            } catch (IllegalArgumentException e) {
+                throw new RPCException("QName was formatted incorrectly: " + o.toString());
+            }
+        }
+        idx.setDocumentTypes(docTypes);
+        return idx;
+    }
+
+    public boolean itemExists(String path) throws RPCException {
+        try {
+            registry.getItemByPath(path);
+            return true;
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            return false;
+        } catch (AccessException e) {
+            // Not sure if this is the right thing to do, but
+            // I think we should err on the side of not showing what
+            // is in the registry
+            return false;
+        }
+            
+    }
+
+    public WLinks getLinks(String itemId, String property) throws RPCException {
+        try {
+            Item item = registry.getItemById(itemId);
+            Links links = item.getProperty(property);
+            PropertyDescriptor pd = typeManager.getPropertyDescriptor(property);
+            
+            return toWeb(links, pd);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        }
+
+    }
+
+    private WLinks toWeb(Links links, PropertyDescriptor pd) {
+        if (links == null) {
+            return null;
+        }
+        
+        WLinks wlinks = new WLinks();
+        
+        List<LinkInfo> deps = new ArrayList<LinkInfo>();
+        
+        for (Link l : links.getLinks()) {
+            deps.add(toWeb(l, false));
+        }
+        wlinks.setLinks(deps);
+        
+        deps = new ArrayList<LinkInfo>();
+        for (Link l : links.getReciprocalLinks()) {
+            deps.add(toWeb(l, true));
+        }
+        wlinks.setReciprocal(deps);
+        
+        
+        wlinks.setReciprocalName(pd.getConfiguration().values().iterator().next());
+        
+        return wlinks;
+    }
+    
+    private LinkInfo toWeb(Link l, boolean recip) {
+        Item i = recip ? l.getItem() : l.getLinkedTo();
+        String name;
+        int itemType;
+        String id = null;
+
+        if (i != null) {
+            itemType = LinkInfo.TYPE_ENTRY;
+            name = i.getPath();
+            id = i.getId();
+        } else if (i == null) {
+            itemType = LinkInfo.TYPE_NOT_FOUND;
+            name = l.getLinkedToPath();
+        } else {
+            throw new UnsupportedOperationException();
+        }
+        return new LinkInfo(l.getId(),
+                            l.isAutoDetected(),
+                            id,
+                            name,
+                            itemType,
+                            recip);
+    }
+
+    private ItemInfo toWebExtended(Item e, boolean showProperties) throws RegistryException {
+        ItemInfo info = toWeb(e, false);
+        
+        Set<Permission> permissions = accessControlManager.getPermissions(SecurityUtils.getCurrentUser(), e);
+        info.setModifiable(permissions.contains(Permission.MODIFY_ITEM));
+        info.setDeletable(permissions.contains(Permission.DELETE_ITEM));
+
+        if (e.isLocal()) {
+            info.setDefaultLifecycleId(e.getDefaultLifecycle().getId());
+        }
+
+        final String context = contextPathResolver.getContextPath();
+        info.setArtifactFeedLink(getLink(context + "/api/registry", e) + ";history");
+        info.setCommentsFeedLink(context + "/api/comments");
+        
+        List<WComment> wcs = info.getComments();
+
+        CommentManager commentManager = e.getCommentManager();
+        if (commentManager != null) {
+            List<Comment> comments = commentManager.getComments(e.getId());
+            for (Comment c : comments) {
+                final SimpleDateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATETIME_FORMAT);
+                WComment wc = new WComment(c.getId(), 
+                                           UserUtils.getUsername(c.getUser()), 
+                                           dateFormat.format(c
+                        .getDate().getTime()), c.getText());
+                wcs.add(wc);
+    
+                Set<Comment> children = c.getComments();
+                if (children != null && children.size() > 0) {
+                    addComments(wc, children);
+                }
+            }
+        }
+
+        populateProperties(e, info, showProperties);
+        
+        return info;
+    }
+
+    public ItemInfo getItemInfo(String itemId, boolean showHidden) throws RPCException, ItemNotFoundException {
+        try {
+            Item item = registry.getItemById(itemId);
+
+            return toWebExtended(item, showHidden);
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public ItemInfo getItemByPath(String path) throws RPCException, ItemNotFoundException {
+        try {
+            Item item = registry.getItemByPath(path);
+            return toWeb(item, false);
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void populateProperties(Item item, ItemInfo vi, boolean showHidden) {
+        for (PropertyInfo p : item.getProperties()) {
+            if (!showHidden && !p.isVisible()) {
+                continue;
+            }
+
+            PropertyDescriptor pd = p.getPropertyDescriptor();
+            Extension ext = pd != null ? pd.getExtension() : null;
+            
+            Object val = toWeb(item, p, ext);
+
+            String desc = p.getDescription();
+            if (desc == null) {
+                desc = p.getName();
+            }
+            
+            String extId = ext != null ? ext.getId() : null;
+            
+            vi.getProperties().add(new WProperty(p.getName(), 
+                                                 desc, 
+                                                 (Serializable) val, 
+                                                 extId, 
+                                                 p.isLocked()));
+        }
+
+        Collections.sort(vi.getProperties(), new Comparator() {
+
+            public int compare(Object o1, Object o2) {
+                return ((WProperty) o1).getDescription().compareTo(((WProperty) o2).getDescription());
+            }
+
+        });
+    }
+
+    private Object toWeb(Item item, PropertyInfo p, Extension ext) {
+        if (ext instanceof LinkExtension) {
+            Links links = p.getValue();
+            
+            return toWeb(links, p.getPropertyDescriptor());
+        } else if (ext instanceof ArtifactExtension) {
+            return getLink(contextPathResolver.getContextPath() + "/api/registry", item.getParent()) 
+                + "?version=" + item.getName();
+        } else {
+            Object internalValue = p.getInternalValue();
+            
+            return convertQNames(internalValue);
+        }
+    }
+
+    /**
+     * This method is here temporarily until we can serialize qnames remotely
+     * @param val
+     */
+    private Object convertQNames(Object val) {
+        if (val instanceof Collection) {
+            List<String> objs = new ArrayList<String>();
+            for (Object o : (Collection) val) {
+                objs.add(o.toString());
+            }
+            return objs;
+        }
+        return val;
+    }
+
+    private String getLink(String base, Item a) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(base).append(a.getPath());
+        return sb.toString();
+    }
+
+    public WComment addComment(String entryId, String parentComment, String text) throws RPCException, ItemNotFoundException {
+        try {
+            Item item = registry.getItemById(entryId);
+
+            Comment comment = new Comment();
+            comment.setText(text);
+
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(new Date());
+            comment.setDate(cal);
+
+            comment.setUser(getCurrentUser());
+
+            Item w = (Item)item.getParent();
+            CommentManager commentManager = w.getCommentManager();
+            if (parentComment != null) {
+                Comment c = commentManager.getComment(parentComment);
+                if (c == null) {
+                    throw new RPCException("Invalid parent comment");
+                }
+                comment.setParent(c);
+            } else {
+                comment.setItem(item);
+            }
+            commentManager.addComment(comment);
+
+            SimpleDateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATETIME_FORMAT);
+            return new WComment(comment.getId(), 
+                                UserUtils.getUsername(comment.getUser()), 
+                                dateFormat.format(comment.getDate().getTime()), 
+                                comment.getText());
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private User getCurrentUser() throws RPCException {
+        UserDetailsWrapper wrapper = (UserDetailsWrapper) SecurityContextHolder.getContext()
+                .getAuthentication().getPrincipal();
+        if (wrapper == null) {
+            throw new RPCException("No user is logged in!");
+        }
+        return wrapper.getUser();
+    }
+
+    private void addComments(WComment parent, Set<Comment> comments) {
+        for (Comment c : comments) {
+            SimpleDateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATETIME_FORMAT);
+            WComment child = new WComment(c.getId(), UserUtils.getUsername(c.getUser()), dateFormat.format(c.getDate()
+                    .getTime()), c.getText());
+            parent.getComments().add(child);
+
+            Set<Comment> children = c.getComments();
+            if (children != null && children.size() > 0) {
+                addComments(child, children);
+            }
+        }
+    }
+
+    public void setProperty(String itemId, String propertyName, Serializable propertyValue) throws RPCException, ItemNotFoundException, WPolicyException {
+        try {
+            Item item = registry.getItemById(itemId);
+
+            PropertyDescriptor pd = typeManager.getPropertyDescriptorByName(propertyName);
+            
+            Object value = getLocalValue(pd, propertyValue, item);
+            
+            item.setProperty(pd.getProperty(), value);
+            
+            registry.save(item);
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        }
+    }
+
+    public Object getLocalValue(PropertyDescriptor pd, 
+                                Serializable s, 
+                                Item item) 
+        throws NotFoundException, RegistryException, AccessException, RPCException {
+        if (pd != null && pd.getExtension() != null) {
+            Extension ext = pd.getExtension();
+            if (ext instanceof LinkExtension) {
+                Links links = item.getProperty(pd.getProperty());
+                WLinks wlinks = (WLinks) s;
+                
+                Collection<Link> linksToRemove = new ArrayList<Link>();
+                Collection<Link> linksToAdd = new ArrayList<Link>();
+                if (links != null) {
+                    linksToRemove.addAll(links.getLinks());
+                }
+                for (Iterator<LinkInfo> itr = wlinks.getLinks().iterator(); itr.hasNext();) {
+                    LinkInfo wl = itr.next();
+                    Link l = getLink(linksToRemove, wl);
+                    
+                    if (l != null) {
+                        linksToRemove.remove(l);
+                    } else {
+                        Item linkTo = registry.getItemByPath(wl.getItemName());
+                        
+                        Link link = new Link(item, linkTo, null, false);
+                        linksToAdd.add(link);
+                    }
+                }
+                
+                if (links != null) {
+                    for (Link l : linksToRemove) {
+                        links.removeLinks(l);
+                    }
+                    for (Link l : linksToAdd) {
+                        links.addLinks(l);
+                    }
+                }
+                
+                return linksToAdd;
+            } else if (ext instanceof ArtifactExtension) {
+                try {
+                    return new Object[] { uploadService.getFile(s.toString()),
+                                          "application/octet-stream" };
+                } catch (FileNotFoundException e) {
+                    throw new RPCException("An error occurred processing the file upload. Please try again.");
+                }
+            } else if (ext instanceof LifecycleExtension) {
+                List ids = (List) s;
+                
+                if (ids.size() != 2) {
+                    throw new RPCException("Lifecycle metadata is wrong length!");
+                }
+                
+                LifecycleManager lifecycleManager;
+                if (item != null) {
+                    lifecycleManager = item.getLifecycleManager();
+                } else {
+                    lifecycleManager = localLifecycleManager;
+                }
+                
+                return (Phase) lifecycleManager.getPhaseById((String)ids.get(1));
+            }
+        } 
+        return s;
+    }
+    
+    private Link getLink(Collection<Link> linkList, LinkInfo l) {
+        for (Link link : linkList) {
+            String path = link.getLinkedToPath();
+            if (link.getId().equals(l.getLinkId())
+                || (path != null && path.equals(l.getItemName()))) {
+                return link;
+            }
+        }
+        return null;
+    }
+
+    public void setPropertyForQuery(String query,
+                                    String propertyName, 
+                                    Serializable propertyValue)
+        throws RPCException, ItemNotFoundException, WPolicyException {
+        try {
+            SearchResults results = registry.search(query, 0, -1);
+            List<Item> items = new ArrayList<Item>();
+            for (Item item : results.getResults()) {
+                PropertyDescriptor pd = typeManager.getPropertyDescriptorByName(propertyName);
+                Extension ext = pd != null ? pd.getExtension() : null;
+                
+                setProperty(item, pd, propertyValue, ext, items);
+            }
+            
+            // don't save until we actually manage to set everything
+            for (Item i : items) {
+                registry.save(i);
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        }
+    }
+
+    public void setProperty(Collection<String> entryIds,
+                            String propertyName, 
+                            Serializable propertyValue)
+        throws RPCException, ItemNotFoundException, WPolicyException {
+        try {
+            List<Item> items = new ArrayList<Item>();
+            for (String itemId : entryIds) {
+                Item item = registry.getItemById(itemId);
+
+                PropertyDescriptor pd = typeManager.getPropertyDescriptorByName(propertyName);
+                Extension ext = pd != null ? pd.getExtension() : null;
+                
+                setProperty(item, pd, propertyValue, ext, items);
+            }
+            
+            // don't save until we actually manage to set everything
+            for (Item i : items) {
+                registry.save(i);
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        }
+    }
+
+    private void setProperty(Item item, 
+                             PropertyDescriptor pd, 
+                             Serializable propertyValue, 
+                             Extension ext,
+                             List<Item> items) throws PropertyException, PolicyException, NotFoundException,
+        RegistryException, AccessException, RPCException {
+        Object value = getLocalValue(pd, propertyValue, item);
+        
+        item.setProperty(pd.getProperty(), value);
+        items.add(item);
+    }
+
+    public void deleteProperty(String itemId, String propertyName) throws RPCException, ItemNotFoundException {
+        try {
+            Item item = registry.getItemById(itemId);
+            item.setProperty(propertyName, null);
+            registry.save(item);
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void deleteProperty(Collection<String> entryIds, String propertyName) throws RPCException, ItemNotFoundException {
+        try {
+            List<Item> items = new ArrayList<Item>();
+            for (String itemId : entryIds) {
+                Item item = registry.getItemById(itemId);
+                
+                item.setProperty(propertyName, null);
+                items.add(item);
+            }
+            // don't save until we actually delete everything
+            for (Item i : items) {
+                registry.save(i);
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void deletePropertyForQuery(String query, String propertyName) throws RPCException, ItemNotFoundException {
+        try {
+            SearchResults results = registry.search(query, 0, -1);
+            List<Item> items = new ArrayList<Item>();
+            for (Item item : results.getResults()) {
+                item.setProperty(propertyName, null);
+            }
+            // don't save until we actually delete everything
+            for (Item i : items) {
+                registry.save(i);
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PropertyException e) {
+            // occurs if property name is formatted wrong
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void deletePropertyDescriptor(String id) throws RPCException {
+        typeManager.deletePropertyDescriptor(id);
+    }
+
+    public WPropertyDescriptor getPropertyDescriptor(String id) throws RPCException, ItemNotFoundException {
+        try {
+            return toWeb(typeManager.getPropertyDescriptor(id));
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        }
+    }
+
+    public List<WPropertyDescriptor> getPropertyDescriptors(boolean includeIndex) throws RPCException {
+        List<WPropertyDescriptor> pds = new ArrayList<WPropertyDescriptor>();
+        for (PropertyDescriptor pd : typeManager.getGlobalPropertyDescriptors(includeIndex)) {
+            pds.add(toWeb(pd));
+        }
+        return pds;
+    }
+
+    private WPropertyDescriptor toWeb(PropertyDescriptor pd) {
+        String ext = pd.getExtension() != null ? pd.getExtension().getId() : null;
+        
+        WPropertyDescriptor wpd = new WPropertyDescriptor(pd.getId(), pd.getProperty(), pd.getDescription(), ext, pd.isMultivalued(), pd.getConfiguration());
+        if (pd.getType() != null) {
+            wpd.setTypeId(pd.getType().getId());
+        }
+        return wpd;
+    }
+
+    public void savePropertyDescriptor(WPropertyDescriptor wpd) throws RPCException, ItemNotFoundException, ItemExistsException {
+        try {
+            PropertyDescriptor pd;
+
+            if (wpd.getId() == null) {
+                pd = new PropertyDescriptor();
+            } else {
+                pd = typeManager.getPropertyDescriptor(wpd.getId());
+            }
+
+            pd.setProperty(wpd.getName());
+            pd.setDescription(wpd.getDescription());
+            pd.setMultivalued(wpd.isMultiValued());
+            pd.setConfiguration(wpd.getConfiguration());
+            pd.setExtension(registry.getExtension(wpd.getExtension()));
+            
+            typeManager.savePropertyDescriptor(pd);
+
+            wpd.setId(pd.getId());
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    
+    public List<WType> getTypes() throws RPCException {
+        ArrayList<WType> types = new ArrayList<WType>();
+        for (Type type : typeManager.getTypes()) {
+            types.add(toWeb(type));
+        }
+        return types;
+    }
+
+    public WType getType(String id) throws RPCException {
+        try {
+            return toWeb(typeManager.getType(id));
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void saveType(WType wt) throws RPCException, ItemExistsException {
+        try {
+            Type type = fromWeb(wt);
+            
+            // have to do two phases of saving. First, get a type ID
+            // then use that type ID on any property that was created
+            List<PropertyDescriptor> props = type.getProperties();
+            type.setProperties(null);
+            
+            typeManager.saveType(type);
+            
+            for (PropertyDescriptor pd : props) {
+                typeManager.savePropertyDescriptor(pd);
+            }
+            
+            type.setProperties(props);
+            typeManager.saveType(type);
+            
+            wt.setId(type.getId());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private Type fromWeb(WType wt) throws NotFoundException {
+        Type type = new Type();
+        type.setId(wt.getId());
+        type.setName(wt.getName());
+        type.setAllowedChildren(fromWebToTypes(wt.getAllowedChildrenIds()));
+        type.setMixins(fromWebToTypes(wt.getMixinIds()));
+        
+        List<PropertyDescriptor> properties = new ArrayList<PropertyDescriptor>();
+        for (WPropertyDescriptor wpd : wt.getProperties()) {
+            PropertyDescriptor pd;
+            if (wpd.getId() != null  && !"new".equals(wpd.getId())) {
+                pd = typeManager.getPropertyDescriptor(wpd.getId());
+            } else {
+                pd = new PropertyDescriptor();
+                pd.setMultivalued(wpd.isMultiValued());
+                pd.setConfiguration(wpd.getConfiguration());
+                pd.setExtension(registry.getExtension(wpd.getExtension()));
+            }
+            
+            pd.setProperty(wpd.getName());
+            pd.setDescription(wpd.getDescription());
+            
+            properties.add(pd);
+        }
+        type.setProperties(properties);
+        
+        return type;
+    }
+
+    private List<Type> fromWebToTypes(List<String> allowedChildrenIds) 
+        throws NotFoundException {
+        List<Type> types = new ArrayList<Type>();
+        for (String id : allowedChildrenIds) {
+            types.add(typeManager.getType(id));
+        }
+        return types;
+    }
+    
+    private List<String> toWeb(List<Type> children) {
+        if (children == null) return Collections.emptyList();
+        
+        List<String> types = new ArrayList<String>();
+        for (Type t : children) {
+            types.add(t.getId());
+        }
+        return types;
+    }
+
+    private WType toWeb(Type type) {
+        WType wt = new WType();
+        wt.setId(type.getId());
+        wt.setName(type.getName());
+        ArrayList<WPropertyDescriptor> pds = new ArrayList<WPropertyDescriptor>();
+        if (type.getProperties() != null) {
+            for (PropertyDescriptor pd : type.getProperties()) {
+                pds.add(toWeb(pd));
+            }
+        }
+        wt.setProperties(pds);
+        wt.setAllowedChildrenIds(toWeb(type.getAllowedChildren()));
+        wt.setMixinIds(toWeb(type.getMixins()));
+        wt.getMixinIds().remove(type.getId());
+        wt.setSystem(type.isSystemType());
+        
+        return wt;
+    }
+
+    public Map<String, String> getQueryProperties() throws RPCException {
+        return registry.getQueryProperties();
+    }
+    
+    public void move(String itemId, String workspacePath, String name) 
+        throws RPCException, ItemNotFoundException, WPolicyException {
+        try {
+            Item i = registry.getItemById(itemId);
+            
+            registry.move(i, workspacePath, name);
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        } catch (PropertyException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void delete(String itemId) throws RPCException, ItemNotFoundException {
+        try {
+            Item item = registry.getItemById(itemId);
+
+            item.delete();
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void delete(List<String> ids) throws RPCException, ItemNotFoundException {
+        try {
+            for (String id : ids) {
+                Item item = registry.getItemById(id);
+    
+                item.delete();
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void transition(Collection<String> entryIds, String lifecycle, String phase) throws RPCException, ItemNotFoundException {
+        
+    }
+
+    public Collection<WLifecycle> getLifecycles() throws RPCException {
+        Collection<Lifecycle> lifecycles = localLifecycleManager.getLifecycles();
+        Lifecycle defaultLifecycle = localLifecycleManager.getDefaultLifecycle();
+
+        ArrayList<WLifecycle> wls = new ArrayList<WLifecycle>();
+        for (Lifecycle l : lifecycles) {
+            WLifecycle lifecycle = toWeb(l, defaultLifecycle.equals(l));
+            wls.add(lifecycle);
+        }
+
+        return wls;
+    }
+
+    public WLifecycle getLifecycle(String id) throws RPCException {
+        try {
+            Lifecycle defaultLifecycle = localLifecycleManager.getDefaultLifecycle();
+
+            Lifecycle l = localLifecycleManager.getLifecycleById(id);
+
+            return toWeb(l, defaultLifecycle.equals(l));
+        } catch (Exception e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private WLifecycle toWeb(Lifecycle l, boolean defaultLifecycle) {
+        WLifecycle lifecycle = new WLifecycle(l.getId(), l.getName(), defaultLifecycle);
+
+        List<WPhase> wphases = new ArrayList<WPhase>();
+        lifecycle.setPhases(wphases);
+
+        for (Phase p : l.getPhases().values()) {
+            WPhase wp = toWeb(p);
+            wphases.add(wp);
+
+            if (p.equals(l.getInitialPhase())) {
+                lifecycle.setInitialPhase(wp);
+            }
+        }
+
+        for (Phase p : l.getPhases().values()) {
+            WPhase wp = lifecycle.getPhase(p.getName());
+            List<WPhase> nextPhases = new ArrayList<WPhase>();
+
+            for (Phase next : p.getNextPhases()) {
+                WPhase wnext = lifecycle.getPhase(next.getName());
+
+                nextPhases.add(wnext);
+            }
+            wp.setNextPhases(nextPhases);
+        }
+
+        Collections.sort(wphases, new Comparator<WPhase>() {
+
+            public int compare(WPhase o1, WPhase o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+
+        });
+        return lifecycle;
+    }
+
+    private WPhase toWeb(Phase p) {
+        WPhase wp = new WPhase(p.getId(), p.getName());
+        return wp;
+    }
+
+    public Collection<String> getActivePoliciesForLifecycle(String lifecycleName, String workspaceId)
+            throws RPCException {
+        Collection<Policy> pols;
+        Lifecycle lifecycle = localLifecycleManager.getLifecycle(lifecycleName);
+        try {
+            if (workspaceId != null) {
+                Item w = (Item) registry.getItemById(workspaceId);
+                pols = policyManager.getActivePolicies(w, lifecycle);
+            } else {
+                pols = policyManager.getActivePolicies(lifecycle);
+            }
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+        return getArtifactPolicyIds(pols);
+    }
+
+    public Collection<String> getActivePoliciesForPhase(String lifecycle, 
+                                                        String phaseName, 
+                                                        String itemId)
+            throws RPCException {
+        Collection<Policy> pols;
+        Phase phase = localLifecycleManager.getLifecycle(lifecycle).getPhase(phaseName);
+        try {
+            if (itemId != null) {
+                Item w = (Item) registry.getItemById(itemId);
+                pols = policyManager.getActivePolicies(w, phase);
+            } else {
+                pols = policyManager.getActivePolicies(phase);
+            }
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+
+        return getArtifactPolicyIds(pols);
+    }
+
+    public void setActivePolicies(String itemId, 
+                                  String lifecycle, 
+                                  String phase, Collection<String> ids)
+            throws RPCException, WPolicyException, ItemNotFoundException {
+        Lifecycle l = localLifecycleManager.getLifecycle(lifecycle);
+        List<Policy> policies = getArtifactPolicies(ids);
+
+        try {
+            if (phase != null) {
+                Phase p = l.getPhase(phase);
+
+                if (p == null) {
+                    throw new RPCException("Invalid phase: " + phase);
+                }
+
+                List<Phase> phases = Arrays.asList(p);
+
+                if (itemId == null || "".equals(itemId)) {
+                    policyManager.setActivePolicies(phases, policies.toArray(new Policy[policies
+                            .size()]));
+                } else {
+                    Item w = (Item) registry.getItemById(itemId);
+                    policyManager.setActivePolicies(w, phases, policies.toArray(new Policy[policies
+                            .size()]));
+                }
+            } else {
+                if (itemId == null || "".equals(itemId)) {
+                    policyManager.setActivePolicies(l, policies.toArray(new Policy[policies.size()]));
+                } else {
+                    Item w = (Item) registry.getItemById(itemId);
+                    policyManager.setActivePolicies(w, l, policies
+                            .toArray(new Policy[policies.size()]));
+                }
+            }
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        } catch (PolicyException e) {
+            throw toWeb(e);
+        } catch (NotFoundException e) {
+            throw new ItemNotFoundException();
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private WPolicyException toWeb(PolicyException e) throws RPCException {
+        Map<ItemInfo, Collection<WApprovalMessage>> failures = new HashMap<ItemInfo, Collection<WApprovalMessage>>();
+        for (Map.Entry<Item, List<ApprovalMessage>> entry : e.getPolicyFailures().entrySet()) {
+            Item i = entry.getKey();
+            List<ApprovalMessage> approvals = entry.getValue();
+
+            try {
+                ItemInfo info = toWeb(i, false);
+    
+                ArrayList<WApprovalMessage> wapprovals = new ArrayList<WApprovalMessage>();
+                for (ApprovalMessage app : approvals) {
+                    wapprovals.add(new WApprovalMessage(app.getMessage(), app.isWarning()));
+                }
+    
+                failures.put(info, wapprovals);
+            } catch (RegistryException ex) {
+                log.error(ex.getMessage(), ex);
+                throw new RPCException(ex.getMessage());
+            }
+        }
+        return new WPolicyException(failures);
+    }
+
+    private List<Policy> getArtifactPolicies(Collection ids) {
+        List<Policy> policies = new ArrayList<Policy>();
+        for (Iterator itr = ids.iterator(); itr.hasNext();) {
+            String id = (String) itr.next();
+
+            Policy policy = policyManager.getPolicy(id);
+            policies.add(policy);
+        }
+        return policies;
+    }
+
+    private Collection<String> getArtifactPolicyIds(Collection<Policy> pols) {
+        ArrayList<String> polNames = new ArrayList<String>();
+        for (Policy ap : pols) {
+            polNames.add(ap.getId());
+        }
+        return polNames;
+    }
+
+    public Collection<WPolicy> getPolicies() throws RPCException {
+        Collection<Policy> policies = policyManager.getPolicies();
+        List<WPolicy> gwtPolicies = new ArrayList<WPolicy>();
+        for (Policy p : policies) {
+            gwtPolicies.add(toWeb(p));
+        }
+        Collections.sort(gwtPolicies, new Comparator<WPolicy>() {
+
+            public int compare(WPolicy o1, WPolicy o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+
+        });
+
+        return gwtPolicies;
+    }
+
+    public void saveLifecycle(WLifecycle wl) throws RPCException, ItemExistsException {
+        Lifecycle l = fromWeb(wl);
+
+        try {
+            localLifecycleManager.save(l);
+
+            if (wl.isDefaultLifecycle()) {
+                Lifecycle defaultLifecycle = localLifecycleManager.getDefaultLifecycle();
+
+                if (!defaultLifecycle.equals(l)) {
+                    localLifecycleManager.setDefaultLifecycle(l);
+                }
+            }
+        } catch (DuplicateItemException e) {
+            throw new ItemExistsException();
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    public void deleteLifecycle(String id) throws RPCException {
+        try {
+            String fallback = localLifecycleManager.getDefaultLifecycle().getId();
+
+            if (id.equals(fallback)) {
+                throw new RPCException("The default lifecycle cannot be deleted. Please assign " +
+                        "another lifecycle to be the default before deleting this one.");
+            }
+
+            localLifecycleManager.delete(id, fallback);
+        } catch (NotFoundException e) {
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    private Lifecycle fromWeb(WLifecycle wl) throws RPCException {
+        Lifecycle l = new Lifecycle();
+        l.setPhases(new HashMap<String, Phase>());
+        l.setName(wl.getName());
+        l.setId(wl.getId());
+
+        for (Object o : wl.getPhases()) {
+            WPhase wp = (WPhase) o;
+
+            Phase p = new Phase(l);
+            p.setId(wp.getId());
+            p.setName(wp.getName());
+            l.getPhases().put(p.getName(), p);
+        }
+
+        for (Object o : wl.getPhases()) {
+            WPhase wp = (WPhase) o;
+            Phase p = l.getPhase(wp.getName());
+            p.setNextPhases(new HashSet<Phase>());
+
+            if (wp.getNextPhases() != null) {
+                for (Object oNext : wp.getNextPhases()) {
+                    WPhase wNext = (WPhase) oNext;
+                    Phase next = l.getPhase(wNext.getName());
+
+                    p.getNextPhases().add(next);
+                }
+            }
+        }
+
+        if (wl.getInitialPhase() == null) {
+            throw new RPCException("You must set a phase as the initial phase.");
+        }
+
+        l.setInitialPhase(l.getPhase(wl.getInitialPhase().getName()));
+        return l;
+    }
+
+    private WPolicy toWeb(Policy p) {
+        WPolicy wap = new WPolicy();
+        wap.setId(p.getId());
+        wap.setDescription(p.getDescription());
+        wap.setName(p.getName());
+
+        return wap;
+    }
+
+    public Collection<WActivity> getActivities(Date from, Date to, 
+                                               String user,
+                                               String itemPath,
+                                               String text,
+                                               String eventTypeStr, int start,
+                                    int results, boolean ascending) throws RPCException {
+
+        if ("All".equals(user)) {
+            user = null;
+        }
+
+        if (from != null) {
+            Calendar c = Calendar.getInstance();
+            c.setTime(from);
+            c.set(Calendar.HOUR, 0);
+            c.set(Calendar.MINUTE, 0);
+            c.set(Calendar.SECOND, 0);
+            from = c.getTime();
+        }
+
+        if (to != null) {
+            Calendar c = Calendar.getInstance();
+            c.setTime(to);
+            c.set(Calendar.HOUR, 23);
+            c.set(Calendar.MINUTE, 59);
+            c.set(Calendar.SECOND, 59);
+            to = c.getTime();
+        }
+
+        EventType eventType = null;
+        if ("Info".equals(eventTypeStr)) {
+            eventType = EventType.INFO;
+        } else if ("Warning".equals(eventTypeStr)) {
+            eventType = EventType.WARNING;
+        } else if ("Error".equals(eventTypeStr)) {
+            eventType = EventType.ERROR;
+        }
+
+        
+        try {
+            String itemId = null;
+            if (itemPath != null && !"[All Items]".equals(itemPath)) {
+                try {
+                    itemId = registry.getItemByPath(itemPath).getId();
+                } catch (NotFoundException e) {
+                    throw new RPCException("You do not have sufficient permissions to view activities relating to that item.");
+                }
+            }
+            
+            Collection<Activity> activities = activityManager.getActivities(from, to, user, 
+                                                                            itemId, text,
+                                                                            eventType, start, 
+                                                                            results, ascending);
+
+            ArrayList<WActivity> wactivities = new ArrayList<WActivity>();
+
+            for (Activity a : activities) {
+                wactivities.add(createWActivity(a));
+            }
+            return wactivities;
+        } catch (AccessException e) {
+            throw new RPCException(e.getMessage());
+        } catch (RegistryException e) {
+            log.error(e.getMessage(), e);
+            throw new RPCException(e.getMessage());
+        }
+    }
+
+    protected WActivity createWActivity(Activity a) {
+        WActivity wa = new WActivity();
+        wa.setId(a.getId());
+        wa.setEventType(a.getEventType().getText());
+        if (a.getUser() != null) {
+            wa.setUsername(a.getUser().getUsername());
+            wa.setName(a.getUser().getName());
+        }
+        wa.setMessage(a.getMessage());
+        SimpleDateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATETIME_FORMAT);
+        wa.setDate(dateFormat.format(a.getDate().getTime()));
+        return wa;
+    }
+
+    public void setAccessControlManager(AccessControlManager accessControlManager) {
+        this.accessControlManager = accessControlManager;
+    }
+
+    public void setRegistry(Registry registry) {
+        this.registry = registry;
+    }
+
+    public void setTypeManager(TypeManager typeManager) {
+        this.typeManager = typeManager;
+    }
+
+    public void setLifecycleManager(LifecycleManager lifecycleManager) {
+        this.localLifecycleManager = lifecycleManager;
+    }
+
+    public void setArtifactTypeDao(ArtifactTypeDao artifactTypeDao) {
+        this.artifactTypeDao = artifactTypeDao;
+    }
+
+    public void setPolicyManager(PolicyManager policyManager) {
+        this.policyManager = policyManager;
+    }
+
+    public void setRendererManager(RendererManager viewManager) {
+        this.rendererManager = viewManager;
+    }
+
+    public void setActivityManager(ActivityManager activityManager) {
+        this.activityManager = activityManager;
+    }
+
+    public void setIndexManager(IndexManager indexManager) {
+        this.indexManager = indexManager;
+    }
+
+    public void setArtifactViewManager(ArtifactViewManager artifactViewManager) {
+        this.artifactViewManager = artifactViewManager;
+    }
+
+    public ContextPathResolver getContextPathResolver() {
+        return contextPathResolver;
+    }
+
+    public void setContextPathResolver(final ContextPathResolver contextPathResolver) {
+        this.contextPathResolver = contextPathResolver;
+    }
+
+    public EventManager getEventManager() {
+        return eventManager;
+    }
+
+    public void setEventManager(final EventManager eventManager) {
+        this.eventManager = eventManager;
+    }
+
+    public void setUploadService(UploadService uploadService) {
+        this.uploadService = uploadService;
+    }
+
+    public void setUserManager(UserManager userManager) {
+        this.userManager = userManager;
+    }
+    
+}

Copied: branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathResolver.java (from rev 2109, branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/ContextPathResolver.java) (0 => 2111)

--- branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathResolver.java	                        (rev 0)
+++ branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathResolver.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,85 @@
+/*
+ * $Id$
+ * --------------------------------------------------------------------------------------
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.mule.galaxy.web;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.springframework.web.context.ContextLoader;
+import org.springframework.web.context.WebApplicationContext;
+
+/**
+ * Correctly resolves root context path both for WAR deployments in root/non-root contexts,
+ * as well as for test runs. There's some inconsistent behavior across servlet containers
+ * in this regard, and then the case is complicated by embedded and test runs of Galaxy.
+ * You may need to deploy a related filter for things to work in some scenarios (already
+ * done in Galaxy out-of-the-box).
+ *
+ * @see org.mule.galaxy.web.ContextPathSaverFilter
+ */
+public class ContextPathResolver
+{
+    /**
+     * A resolved context path. Optional, may never get set in some embedded scenarios.
+     */
+    private final static AtomicReference<String> savedContextPath = new AtomicReference<String>(null);
+
+    /**
+     * Returns:
+     * <ul>
+     *  <li>"" (empty) string when no servlet container is available (e.g. a test run)
+     *  <li>"" (empty) string when deployed to a servlet container root context
+     *  <li>context path name otherwise
+     * </ul>
+     * @return path
+     */
+    public String getContextPath()
+    {
+        String path = savedContextPath.get();
+        if (path != null)
+        {
+            // we're running in a container, filter intercepted the context path
+            return path;
+        } else
+        {
+            path = "";
+        }
+
+        // otherwise, let's try to guess, as we're running either embedded or in a test
+        WebApplicationContext context = ContextLoader.getCurrentWebApplicationContext();
+        if (context != null)
+        {
+            path = context.getServletContext().getServletContextName();
+            // when deployed in a servlet container under the server root
+            if ("/".equals(path))
+            {
+                path = "";
+            }
+        }
+        return path;
+    }
+
+    /**
+     * Normally called by a {@link org.mule.galaxy.web.ContextPathSaverFilter}. 
+     * @param path resolved context path
+     */
+    public static void saveContextPath(String path)
+    {
+        savedContextPath.compareAndSet(null, path);
+    }
+}

Copied: branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java (from rev 2109, branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java) (0 => 2111)

--- branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java	                        (rev 0)
+++ branches/product_cleanup/repository/server/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,55 @@
+/*
+ * $Id$
+ * --------------------------------------------------------------------------------------
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.mule.galaxy.web;
+
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Saves the currently deployed context path.
+ * @see ContextPathResolver
+ */
+public class ContextPathSaverFilter implements Filter
+{
+    
+
+    public void init(FilterConfig config) throws ServletException
+    {
+
+    }
+
+    public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException
+    {
+        ContextPathResolver.saveContextPath(((HttpServletRequest) req).getContextPath());
+        chain.doFilter(req, resp);
+    }
+
+    public void destroy()
+    {
+    }
+
+}

Added: branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml (0 => 2111)

--- branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml	                        (rev 0)
+++ branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -0,0 +1,46 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:a="http://abdera.apache.org"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+    http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+    http://abdera.apache.org http://abdera.apache.org/schemas/abdera-spring.xsd">
+    
+
+    <bean id="coreGwtModule" class="org.mule.galaxy.web.GwtModule">
+      <property name="core" value="true"/>
+      <property name="name" value="org.mule.galaxy.web.Repository"/>
+      <property name="rpcServices">
+        <map>
+          <entry key="/galaxyService.rpc" value-ref="galaxyService" />
+          <entry key="/securityService.rpc" value-ref="gwtSecurityService" />
+          <entry key="/heartbeat.rpc" value-ref="heartbeatService"/>
+          <entry key="/admin.rpc" value-ref="adminService"/>
+          <entry key="/registry.rpc" value-ref="gwtRegistry" />
+        </map>
+      </property>
+    </bean>
+    
+    <bean id="gwtRegistry" class="org.mule.galaxy.repository.RegistryServiceImpl">
+      <property name="registry" ref="registry"/>
+      <property name="artifactTypeDao" ref="artifactTypeDao"/>
+      <property name="indexManager" ref="indexManager"/>
+      <property name="rendererManager" ref="rendererManager"/>
+      <property name="lifecycleManager" ref="lifecycleManager"/>
+      <property name="policyManager" ref="policyManager"/>
+      <property name="activityManager" ref="activityManager"/>
+      <property name="artifactViewManager" ref="artifactViewManager"/>
+      <property name="accessControlManager" ref="accessControlManager"/>
+      <property name="typeManager" ref="typeManager"/>
+      <property name="uploadService" ref="uploadService"/>
+      <property name="userManager" ref="userManager"/>
+      <property name="contextPathResolver">
+          <bean class="org.mule.galaxy.web.ContextPathResolver"/>
+      </property>
+      <property name="eventManager" ref="eventManager"/>
+    </bean>
+
+</beans>
\ No newline at end of file
Property changes on: branches/product_cleanup/repository/server/src/main/resources/META-INF/galaxy-applicationContext.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Rev Date Id
Name: svn:eol-style
   + native

Modified: branches/product_cleanup/repository/server/src/test/java/org/mule/galaxy/web/server/RegistryServiceTest.java (2110 => 2111)

--- branches/product_cleanup/repository/server/src/test/java/org/mule/galaxy/web/server/RegistryServiceTest.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/repository/server/src/test/java/org/mule/galaxy/web/server/RegistryServiceTest.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -20,27 +20,28 @@
 import org.mule.galaxy.policy.ApprovalMessage;
 import org.mule.galaxy.policy.Policy;
 import org.mule.galaxy.query.Query;
+import org.mule.galaxy.repository.RegistryServiceImpl;
+import org.mule.galaxy.repository.rpc.ItemInfo;
+import org.mule.galaxy.repository.rpc.RegistryService;
+import org.mule.galaxy.repository.rpc.WApprovalMessage;
+import org.mule.galaxy.repository.rpc.WArtifactType;
+import org.mule.galaxy.repository.rpc.WComment;
+import org.mule.galaxy.repository.rpc.WIndex;
+import org.mule.galaxy.repository.rpc.WLifecycle;
+import org.mule.galaxy.repository.rpc.WLinks;
+import org.mule.galaxy.repository.rpc.WPolicyException;
+import org.mule.galaxy.repository.rpc.WProperty;
+import org.mule.galaxy.repository.rpc.WPropertyDescriptor;
+import org.mule.galaxy.repository.rpc.WSearchResults;
+import org.mule.galaxy.repository.rpc.WType;
 import org.mule.galaxy.test.AbstractGalaxyTest;
 import org.mule.galaxy.type.PropertyDescriptor;
 import org.mule.galaxy.type.Type;
 import org.mule.galaxy.type.TypeManager;
 import org.mule.galaxy.web.rpc.GalaxyService;
-import org.mule.galaxy.web.rpc.ItemInfo;
 import org.mule.galaxy.web.rpc.LinkInfo;
 import org.mule.galaxy.web.rpc.PluginTabInfo;
-import org.mule.galaxy.web.rpc.RegistryService;
 import org.mule.galaxy.web.rpc.SearchPredicate;
-import org.mule.galaxy.web.rpc.WApprovalMessage;
-import org.mule.galaxy.web.rpc.WArtifactType;
-import org.mule.galaxy.web.rpc.WComment;
-import org.mule.galaxy.web.rpc.WIndex;
-import org.mule.galaxy.web.rpc.WLifecycle;
-import org.mule.galaxy.web.rpc.WLinks;
-import org.mule.galaxy.web.rpc.WPolicyException;
-import org.mule.galaxy.web.rpc.WProperty;
-import org.mule.galaxy.web.rpc.WPropertyDescriptor;
-import org.mule.galaxy.web.rpc.WSearchResults;
-import org.mule.galaxy.web.rpc.WType;
 import org.mule.galaxy.web.rpc.WUser;
 
 public class RegistryServiceTest extends AbstractGalaxyTest {

Modified: branches/product_cleanup/web/pom.xml (2110 => 2111)

--- branches/product_cleanup/web/pom.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/web/pom.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -45,6 +45,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.mule.galaxy</groupId>
+            <artifactId>galaxy-repository-server</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
             <groupId>com.extjs</groupId>
             <artifactId>gxt</artifactId>
         </dependency>

Deleted: branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java (2110 => 2111)

--- branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/ContextPathSaverFilter.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,56 +0,0 @@
-/*
- * $Id$
- * --------------------------------------------------------------------------------------
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-package org.mule.galaxy.web;
-
-import org.mule.galaxy.web.server.ContextPathResolver;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Saves the currently deployed context path.
- * @see ContextPathResolver
- */
-public class ContextPathSaverFilter implements Filter
-{
-    
-
-    public void init(FilterConfig config) throws ServletException
-    {
-
-    }
-
-    public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException
-    {
-        ContextPathResolver.saveContextPath(((HttpServletRequest) req).getContextPath());
-        chain.doFilter(req, resp);
-    }
-
-    public void destroy()
-    {
-    }
-
-}

Deleted: branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/ContextPathResolver.java (2110 => 2111)

--- branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/ContextPathResolver.java	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/web/src/main/java/org/mule/galaxy/web/server/ContextPathResolver.java	2009-12-16 23:18:07 UTC (rev 2111)
@@ -1,85 +0,0 @@
-/*
- * $Id$
- * --------------------------------------------------------------------------------------
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-package org.mule.galaxy.web.server;
-
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.springframework.web.context.ContextLoader;
-import org.springframework.web.context.WebApplicationContext;
-
-/**
- * Correctly resolves root context path both for WAR deployments in root/non-root contexts,
- * as well as for test runs. There's some inconsistent behavior across servlet containers
- * in this regard, and then the case is complicated by embedded and test runs of Galaxy.
- * You may need to deploy a related filter for things to work in some scenarios (already
- * done in Galaxy out-of-the-box).
- *
- * @see org.mule.galaxy.web.ContextPathSaverFilter
- */
-public class ContextPathResolver
-{
-    /**
-     * A resolved context path. Optional, may never get set in some embedded scenarios.
-     */
-    private final static AtomicReference<String> savedContextPath = new AtomicReference<String>(null);
-
-    /**
-     * Returns:
-     * <ul>
-     *  <li>"" (empty) string when no servlet container is available (e.g. a test run)
-     *  <li>"" (empty) string when deployed to a servlet container root context
-     *  <li>context path name otherwise
-     * </ul>
-     * @return path
-     */
-    public String getContextPath()
-    {
-        String path = savedContextPath.get();
-        if (path != null)
-        {
-            // we're running in a container, filter intercepted the context path
-            return path;
-        } else
-        {
-            path = "";
-        }
-
-        // otherwise, let's try to guess, as we're running either embedded or in a test
-        WebApplicationContext context = ContextLoader.getCurrentWebApplicationContext();
-        if (context != null)
-        {
-            path = context.getServletContext().getServletContextName();
-            // when deployed in a servlet container under the server root
-            if ("/".equals(path))
-            {
-                path = "";
-            }
-        }
-        return path;
-    }
-
-    /**
-     * Normally called by a {@link org.mule.galaxy.web.ContextPathSaverFilter}. 
-     * @param path resolved context path
-     */
-    public static void saveContextPath(String path)
-    {
-        savedContextPath.compareAndSet(null, path);
-    }
-}

Modified: branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml (2110 => 2111)

--- branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml	2009-12-16 02:14:51 UTC (rev 2110)
+++ branches/product_cleanup/web/src/main/resources/META-INF/applicationContext-web.xml	2009-12-16 23:18:07 UTC (rev 2111)
@@ -16,7 +16,7 @@
     
     <bean id="coreGwtModule" class="org.mule.galaxy.web.GwtModule">
       <property name="core" value="true"/>
-      <property name="name" value="org.mule.galaxy.web.Galaxy"/>
+      <property name="name" value="org.mule.galaxy.web.Admin"/>
       <property name="rpcServices">
         <map>
           <entry key="/galaxyService.rpc" value-ref="galaxyService" />

--------------------------------------------------------------------- To unsubscribe from this list, please visit: http://admin.muleforge.org/manage_email

From forum: MuleForge Dev

Component Binding - Mature ?

2009-12-16T14:39:33Z

Does it not seem that component binding is a little cumbersome in that it requires a java class and realization, vs. just configuration? Content enrichment is a basic EAI pattern.

Imagine a case of a msg containing employee ID. Msg is enriched with employee name, via db lookup. Component binding seems to be the way recommended.

Am I missing something?

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - User

Mule Deployment Organization

2009-12-16T14:32:00Z

Looking for guidance on strategy for organizing services across standalone servers.

I am concerned about the overhead of running several servers, each with its own JVM, vs the fragility of several services bundled together, and one failure impacting all.

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - User

Re: Question on Asynchronous Reply Router

2009-12-16T12:11:04Z

I wonder if replyTo simply doesn't have response transformers applied in this case. Can you play with sync/async flags there?

Andrew

From forum: Mule - User

Question on Asynchronous Reply Router

2009-12-16T12:09:16Z

I'm using a static recipient list to to send a single message to two additional mule services. These two services are configured to reply to a custom async reply router where I do some processing to combine the results of both services. Each of the static recipient services uses a response transformer to manipulate their respective responses and then I'd like to combine those manipulated responses in the async router. The problem is that the async reply router is recieving the raw responses from the static recipient services rather than the transformer manipulated responses. Is there a way to configure this so that the async reply router receives the manipulated responses rather than the raw responses?

Here is my configuration:

<service name="mainservice">
<inbound>
<vm:inbound-endpoint
address="vm://mainservice">
</vm:inbound-endpoint>
</inbound>
<outbound>
<static-recipient-list-router synchronous="true">
<reply-to address="vm://aggregationservice" />
<recipients>
<spring:value>vm://subserviceone</spring:value>
<spring:value>vm://subservicetwo</spring:value>
</recipients>
</static-recipient-list-router>
</outbound>
<async-reply failOnTimeout="false" timeout="20000">
<vm:inbound-endpoint address="vm://aggregationservice"/>
<custom-async-reply-router class="com.fu.MyAggregator"/>
</async-reply>
<default-service-exception-strategy/>
</service>

<service name=+"subserviceone"+>
<inbound>
<vm:inbound-endpoint
transformer-refs="subserviceOneRequestTransformer"
address="vm://subserviceone"
responseTransformer-refs="subserviceOneResponseTransformer">
</vm:inbound-endpoint>
</inbound>
<outbound>
<outbound-pass-through-router>
<cxf:outbound-endpoint
....
</cxf:outbound-endpoint>
</outbound-pass-through-router>
</outbound>
</service>

<service name="subservicetwo">
<inbound>
<vm:inbound-endpoint
transformer-refs="subserviceTwoRequestTransformer"
address="vm://subservicetwo"
responseTransformer-refs="subserviceTwoResponseTransformer">
</vm:inbound-endpoint>
</inbound>
<outbound>
<outbound-pass-through-router>
<cxf:outbound-endpoint
....
</cxf:outbound-endpoint>
</outbound-pass-through-router>
</outbound>
</service>

Its interesting to note that both subservice response transformers execute but their output is not what is sent to the async reply router.

Thanks in advance

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - User

[mule-builds] [Bamboo] Mule - Mule 3.x (3.0.0-M2-SNAPSHOT) JDK5 build 588 has FAILED (1 tests failed, no failures were new). Change made by Dirk Olmes

2009-12-16T11:20:18Z

The project Mule - Mule 3.x (3.0.0-M2-SNAPSHOT) JDK5 has the following 1 change by 1 author:

*Dirk Olmes* made the following changes at

Comment:
Merged revisions 16272 via svnmerge from
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
r16272 | dirk.olmes | 2009-12-16 18:08:18 +0100 (Wed, 16 Dec 2009) | 2 lines

MULE-4658 (SslCertificatesTestCase fails on IBM JDK): this was actually fixed in MULE-4657 but some refactorings never hurt
........

> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslCertificatesTestCase.java (16273)
> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificatesCallback.java (16273)
> /branches/mule-3.x (16273)

---------------------------------------------------------------------------------------

The build has 1 failed test and 2330 successful tests.

Click http://bamboo.mulesource.org/browse/MULE-MULE3JDK5-588 to find out more.

Thanks,

Bamboo

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Builds

[mule-builds] [Bamboo] Mule - Mule 2.2.x (2.2.5-SNAPSHOT) JDK5 build 528 has FAILED (1 tests failed, no failures were new). Change made by Dirk Olmes

2009-12-16T10:41:17Z

The project Mule - Mule 2.2.x (2.2.5-SNAPSHOT) JDK5 has the following 1 change by 1 author:

*Dirk Olmes* made the following changes at

Comment:
MULE-4658 (SslCertificatesTestCase fails on IBM JDK): this was actually fixed in MULE-4657 but some refactorings never hurt

> /branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificatesCallback.java (16272)
> /branches/mule-2.2.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslCertificatesTestCase.java (16272)

---------------------------------------------------------------------------------------

The build has 1 failed test and 2437 successful tests.

Click http://bamboo.mulesource.org/browse/MULE-MULE22JDK5-528 to find out more.

Thanks,

Bamboo

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Builds

http authentication retry

2009-12-16T10:34:05Z

Hello,

i'm using authentication over an HTTP endpoint.
i want to know wether there is a possibility to force the login/passwd dialog box appear each time the couple login/passwd is incorrect ?

thks

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - User

http authentication retry

2009-12-16T10:32:58Z

From forum: Mule - User

[mule-jira] Commented: (MULE-4676) Pooled component throws Null Pointer Exception when set to WHEN-EXHAUSTED-FAIL and after pool get exhausted

2009-12-16T10:14:22Z

[ http://www.mulesource.org/jira/browse/MULE-4676?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=32858#action_32858 ]

jaskirat Bhatia commented on MULE-4676:
---------------------------------------

Please close this case, I accidently open this jira under MULE instead of mule-ee.
Please close this case!

> Pooled component throws Null Pointer Exception when set to WHEN-EXHAUSTED-FAIL and after pool get exhausted
> -----------------------------------------------------------------------------------------------------------
>
> Key: MULE-4676
> URL: http://www.mulesource.org/jira/browse/MULE-4676
> Project: Mule
> Issue Type: Bug
> Components: Core: Components
> Affects Versions: 2.2.2 (EE only)
> Environment: I tried the same test case on 2.2.2-EE, 2.2.3-EE and 2.2.4-EE as well, all throws the same exception
> Reporter: jaskirat Bhatia
>
> Customer Comments:
> When using a pooled component, we had encountered some strange behaviours after pool was exhausted once.
> Sometime, after enduring high request rate, a pooled component get exhausted, after that, it recovers and continue to give back component. But some of these component are causing a null pointer exception. Actually the very reason for this exception is that these components are null. After looking at the sources i found something that seems strange and i would like to know if we simply misuse Mule of if it could be a bug (which would not be so realistic since this component should be largely use and it would be an easy error to encounter).
> When using such a component :
> <pooled-component
> class="com.company.component.component"/>
> <pooling-profile maxActive="5" exhaustedAction="WHEN_EXHAUSTED_FAIL" />
> </pooled-component>
> </service>
> this function from the AbstractJavaComponent
> protected Object invokeComponentInstance(MuleEvent event) throws Exception
> {
> LifecycleAdapter componentLifecycleAdapter = null;
> try
> {
> componentLifecycleAdapter = borrowComponentLifecycleAdaptor();
> return componentLifecycleAdapter.invoke(event);
> }
> finally
> {
> returnComponentLifecycleAdaptor(componentLifecycleAdapter);
> }
> }
> actually ask the PooledJavaComponent class to return a null componentLifecycleAdapter to the pool. Therefore it will be give back once again.
> protected void returnComponentLifecycleAdaptor(LifecycleAdapter lifecycleAdapter)
> {
> lifecycleAdapterPool.returnObject(lifecycleAdapter);
> }
> public void returnObject(Object object)
> {
> if (pool != null)
> {
> try
> {
> pool.returnObject(object);
> }
> catch (Exception ex)
> {
> // declared Exception is never thrown from pool; this is a known bug
> // in
> // the pool API
> }
> }
> }
> Please also see salesforce case:
> https://na6.salesforce.com/50080000008AQjO

From forum: Mule - Issues

[mule-builds] [Bamboo] Mule - Mule 3.x (3.0.0-M2-SNAPSHOT) JDK5 build 587 has FAILED (1 tests failed, no failures were new). Change made by Dirk Olmes

2009-12-16T10:05:06Z

The project Mule - Mule 3.x (3.0.0-M2-SNAPSHOT) JDK5 has the following 1 change by 1 author:

*Dirk Olmes* made the following changes at

Comment:
Merged revisions 16270 via svnmerge from
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
r16270 | dirk.olmes | 2009-12-16 17:33:34 +0100 (Wed, 16 Dec 2009) | 1 line

MULE-4657 (SslCertificateTestCase fails on IBM JDK): re-generate the keystores with certificates that are not expired (they won't until 2037) which makes the test pass on Sun and on IBM JDK.
........

> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SslCertificateTestCase.java (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/muleserver.cer (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/muleclient.cer (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/clientKeystore (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/trustStore (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/serverKeystore (16271)
> /branches/mule-3.x/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificateCallback.java (16271)
> /branches/mule-3.x (16271)
> /branches/mule-3.x/transports/ssl/src/test/resources/README.txt (16271)

---------------------------------------------------------------------------------------

The build has 1 failed test and 2330 successful tests.

Click http://bamboo.mulesource.org/browse/MULE-MULE3JDK5-587 to find out more.

Thanks,

Bamboo

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Builds

[mule-jira] Created: (MULE-4676) Pooled component throws Null Pointer Exception when set to WHEN-EXHAUSTED-FAIL and after pool get exhausted

2009-12-16T10:02:22Z

Pooled component throws Null Pointer Exception when set to WHEN-EXHAUSTED-FAIL and after pool get exhausted
-----------------------------------------------------------------------------------------------------------

Key: MULE-4676
URL: http://www.mulesource.org/jira/browse/MULE-4676
Project: Mule
Issue Type: Bug
Components: Core: Components
Affects Versions: 2.2.2 (EE only)
Environment: I tried the same test case on 2.2.2-EE, 2.2.3-EE and 2.2.4-EE as well, all throws the same exception
Reporter: jaskirat Bhatia

Customer Comments:
When using a pooled component, we had encountered some strange behaviours after pool was exhausted once.

Sometime, after enduring high request rate, a pooled component get exhausted, after that, it recovers and continue to give back component. But some of these component are causing a null pointer exception. Actually the very reason for this exception is that these components are null. After looking at the sources i found something that seems strange and i would like to know if we simply misuse Mule of if it could be a bug (which would not be so realistic since this component should be largely use and it would be an easy error to encounter).

When using such a component :
<pooled-component
class="com.company.component.component"/>
<pooling-profile maxActive="5" exhaustedAction="WHEN_EXHAUSTED_FAIL" />
</pooled-component>
</service>

this function from the AbstractJavaComponent
protected Object invokeComponentInstance(MuleEvent event) throws Exception
{
LifecycleAdapter componentLifecycleAdapter = null;
try
{
componentLifecycleAdapter = borrowComponentLifecycleAdaptor();
return componentLifecycleAdapter.invoke(event);
}
finally
{
returnComponentLifecycleAdaptor(componentLifecycleAdapter);
}
}

actually ask the PooledJavaComponent class to return a null componentLifecycleAdapter to the pool. Therefore it will be give back once again.

protected void returnComponentLifecycleAdaptor(LifecycleAdapter lifecycleAdapter)
{
lifecycleAdapterPool.returnObject(lifecycleAdapter);
}
public void returnObject(Object object)
{
if (pool != null)
{
try
{
pool.returnObject(object);
}
catch (Exception ex)
{
// declared Exception is never thrown from pool; this is a known bug
// in
// the pool API
}
}
}

Please also see salesforce case:
https://na6.salesforce.com/50080000008AQjO

--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://www.mulesource.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

---------------------------------------------------------------------
To unsubscribe from this list, please visit:

http://xircles.codehaus.org/manage_email

From forum: Mule - Issues