You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by dr...@apache.org on 2010/06/09 19:43:27 UTC
svn commit: r953096 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/internal/services/ test/app1/
test/java/org/apache/tapestry5/integration/app1/
test/java/org/apache/tapestry5/integration/app1/pages/
Author: drobiazko
Date: Wed Jun 9 17:43:26 2010
New Revision: 953096
URL: http://svn.apache.org/viewvc?rev=953096&view=rev
Log:
Remove 'Remote Pool Management' functionality which is moved to tapestry-jmx module.
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MBeanSupport.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MBeanSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/RemotePoolManagement.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RemotePoolManagement.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java?rev=953096&r1=953095&r2=953096&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java Wed Jun 9 17:43:26 2010
@@ -14,7 +14,6 @@
package org.apache.tapestry5.internal.services;
-import javax.management.ObjectName;
import javax.servlet.http.Cookie;
import org.apache.tapestry5.SymbolConstants;
@@ -37,8 +36,16 @@ import org.apache.tapestry5.ioc.services
import org.apache.tapestry5.ioc.services.ClasspathURLConverter;
import org.apache.tapestry5.ioc.services.PerthreadManager;
import org.apache.tapestry5.ioc.services.PropertyShadowBuilder;
-import org.apache.tapestry5.ioc.services.RegistryShutdownHub;
-import org.apache.tapestry5.services.*;
+import org.apache.tapestry5.services.ComponentClasses;
+import org.apache.tapestry5.services.ComponentLayer;
+import org.apache.tapestry5.services.ComponentMessages;
+import org.apache.tapestry5.services.ComponentTemplates;
+import org.apache.tapestry5.services.Core;
+import org.apache.tapestry5.services.InvalidationEventHub;
+import org.apache.tapestry5.services.LocalizationSetter;
+import org.apache.tapestry5.services.RequestGlobals;
+import org.apache.tapestry5.services.ResponseCompressionAnalyzer;
+import org.apache.tapestry5.services.UpdateListenerHub;
import org.apache.tapestry5.services.templates.ComponentTemplateLocator;
import org.slf4j.Logger;
@@ -172,9 +179,7 @@ public class InternalModule
InvalidationEventHub templatesHub,
@ComponentMessages
- InvalidationEventHub messagesHub,
-
- MBeanSupport managedBeanSupport)
+ InvalidationEventHub messagesHub)
{
// This covers invalidations due to changes to classes
@@ -192,29 +197,6 @@ public class InternalModule
updateListenerHub.addUpdateListener(service);
- final ObjectName objectName = buildObjectName("org.apache.tapestry5:service=PagePool");
-
- managedBeanSupport.register(service, objectName);
-
- return service;
- }
-
- private ObjectName buildObjectName(String name)
- {
- try
- {
- return new ObjectName(name);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e);
- }
- }
-
- public MBeanSupport buildMBeanSupport(RegistryShutdownHub shutdownHub, @Autobuild MBeanSupportImpl service)
- {
- shutdownHub.addRegistryShutdownListener(service);
-
return service;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java?rev=953096&r1=953095&r2=953096&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java Wed Jun 9 17:43:26 2010
@@ -1495,13 +1495,4 @@ public class CoreBehaviorsTests extends
assertText("id=no-override", "[pre-app]");
assertText("id=override", "[app]");
}
-
- /** TAP5-978 */
- @Test
- public void remote_pool_management()
- {
- clickThru("Remote Pool Management");
-
- assertTextPresent("SoftWait: 10");
- }
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java?rev=953096&r1=953095&r2=953096&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java Wed Jun 9 17:43:26 2010
@@ -435,9 +435,7 @@ public class Index
new Item("unavailablecomponentdemo", "Report Location of Unavailable Component",
"Report Location of Unavailable Component"),
- new Item("discardafterdemo", "@DiscardAfter Demo", "Demo using @DiscardAfter annotation"),
-
- new Item("remotepoolmanagement", "Remote Pool Management", "Proves that Page Pool MBean is registered")
+ new Item("discardafterdemo", "@DiscardAfter Demo", "Demo using @DiscardAfter annotation")
);