JBoss Tools SVN: r2869 - tags/richfaces-2.0.0.beta3.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-08-02 17:50:34 -0400 (Thu, 02 Aug 2007)
New Revision: 2869
Added:
tags/richfaces-2.0.0.beta3/jst/
Log:
2.0.0.beta3 tag for
common
jsf
jst
vpe
Copied: tags/richfaces-2.0.0.beta3/jst (from rev 2868, trunk/jst)
17 years, 5 months
JBoss Tools SVN: r2868 - tags/richfaces-2.0.0.beta3.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-08-02 17:50:30 -0400 (Thu, 02 Aug 2007)
New Revision: 2868
Added:
tags/richfaces-2.0.0.beta3/jsf/
Log:
2.0.0.beta3 tag for
common
jsf
jst
vpe
Copied: tags/richfaces-2.0.0.beta3/jsf (from rev 2867, trunk/jsf)
17 years, 5 months
JBoss Tools SVN: r2867 - tags/richfaces-2.0.0.beta3.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-08-02 17:50:27 -0400 (Thu, 02 Aug 2007)
New Revision: 2867
Added:
tags/richfaces-2.0.0.beta3/common/
Log:
2.0.0.beta3 tag for
common
jsf
jst
vpe
Copied: tags/richfaces-2.0.0.beta3/common (from rev 2866, trunk/common)
17 years, 5 months
JBoss Tools SVN: r2866 - tags.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-08-02 17:50:24 -0400 (Thu, 02 Aug 2007)
New Revision: 2866
Added:
tags/richfaces-2.0.0.beta3/
Log:
2.0.0.beta3 tag for
common
jsf
jst
vpe
17 years, 5 months
JBoss Tools SVN: r2865 - tags.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-08-02 17:49:33 -0400 (Thu, 02 Aug 2007)
New Revision: 2865
Removed:
tags/richfaces-2.0.0.beta3/
Log:
17 years, 5 months
JBoss Tools SVN: r2864 - tags/richfaces-2.0.0.beta3.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-08-02 17:48:32 -0400 (Thu, 02 Aug 2007)
New Revision: 2864
Added:
tags/richfaces-2.0.0.beta3/common/
Log:
2.0.0.beta3 tag for
common
jsf
jst
vpe
Copied: tags/richfaces-2.0.0.beta3/common (from rev 2863, trunk/common)
17 years, 5 months
JBoss Tools SVN: r2863 - tags.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-08-02 17:48:29 -0400 (Thu, 02 Aug 2007)
New Revision: 2863
Added:
tags/richfaces-2.0.0.beta3/
Log:
2.0.0.beta3 tag for
common
jsf
jst
vpe
17 years, 5 months
JBoss Tools SVN: r2862 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: client and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-02 16:40:44 -0400 (Thu, 02 Aug 2007)
New Revision: 2862
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/JBossLaunchAdapter.java
Log:
forced inclusion of adapter
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/JBossLaunchAdapter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/JBossLaunchAdapter.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/JBossLaunchAdapter.java 2007-08-02 20:40:44 UTC (rev 2862)
@@ -0,0 +1,101 @@
+package org.jboss.ide.eclipse.as.core.client;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.server.core.EJBBean;
+import org.eclipse.jst.server.core.JndiLaunchable;
+import org.eclipse.jst.server.core.JndiObject;
+import org.eclipse.jst.server.core.Servlet;
+import org.eclipse.wst.server.core.IModuleArtifact;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.model.IURLProvider;
+import org.eclipse.wst.server.core.model.LaunchableAdapterDelegate;
+import org.eclipse.wst.server.core.model.ServerDelegate;
+import org.eclipse.wst.server.core.util.HttpLaunchable;
+import org.eclipse.wst.server.core.util.WebResource;
+import org.jboss.ide.eclipse.as.core.server.JBossServer;
+
+public class JBossLaunchAdapter extends LaunchableAdapterDelegate {
+
+ private static final String JAVA_NAMING_PROVIDER_URL_PROPKEY = "java.naming.provider.url"; //$NON-NLS-1$
+ private static final String JAVA_NAMING_FACTORY_INITIAL_PROPKEY = "java.naming.factory.initial"; //$NON-NLS-1$
+ public JBossLaunchAdapter() {
+ // TODO Auto-generated constructor stub
+ }
+
+ /*
+ * @see ILaunchableAdapterDelegate#getLaunchable(IServer, IModuleObject)
+ */
+ public Object getLaunchable(IServer server, IModuleArtifact moduleObject) {
+ ServerDelegate delegate = (ServerDelegate)server.loadAdapter(ServerDelegate.class,null);
+ if (!(delegate instanceof JBossServer ))
+ return null;
+ if ((moduleObject instanceof Servlet) ||(moduleObject instanceof WebResource))
+ return prepareHttpLaunchable(moduleObject, delegate);
+
+ if((moduleObject instanceof EJBBean) || (moduleObject instanceof JndiObject))
+ return prepareJndiLaunchable(moduleObject,delegate);
+ return null;
+ }
+
+ private Object prepareJndiLaunchable(IModuleArtifact moduleObject, ServerDelegate delegate) {
+ JndiLaunchable launchable = null;
+ JBossServer server = (JBossServer)delegate;
+ IPath p = new Path(server.getConfigDirectory()).append("jndi.properties");
+ Properties props = new Properties();
+ try {
+ props.load(new FileInputStream(p.toFile()));
+ } catch( IOException ioe ) {
+ props.put(JAVA_NAMING_FACTORY_INITIAL_PROPKEY, "org.jnp.interfaces.NamingContextFactory");
+ props.put(JAVA_NAMING_PROVIDER_URL_PROPKEY,"org.jboss.naming:org.jnp.interfaces");
+ }
+
+ if(moduleObject instanceof EJBBean) {
+ EJBBean bean = (EJBBean)moduleObject;
+ launchable = new JndiLaunchable(props,bean.getJndiName());
+ }
+ if(moduleObject instanceof JndiObject) {
+ JndiObject jndi = (JndiObject)moduleObject;
+ launchable = new JndiLaunchable(props,jndi.getJndiName());
+ }
+ return launchable;
+ }
+
+ /**
+ * @param moduleObject
+ * @param delegate
+ * @return object
+ */
+ private Object prepareHttpLaunchable(IModuleArtifact moduleObject, ServerDelegate delegate) {
+ try {
+ URL url = ((IURLProvider) delegate).getModuleRootURL(moduleObject.getModule());
+
+ if (moduleObject instanceof Servlet) {
+ Servlet servlet = (Servlet) moduleObject;
+ if (servlet.getAlias() != null) {
+ String path = servlet.getAlias();
+ if (path.startsWith("/")) //$NON-NLS-1$
+ path = path.substring(1);
+ url = new URL(url, path);
+ } else
+ url = new URL(url, "servlet/" + servlet.getServletClassName()); //$NON-NLS-1$
+ } else if (moduleObject instanceof WebResource) {
+ WebResource resource = (WebResource) moduleObject;
+ String path = resource.getPath().toString();
+ if (path != null && path.startsWith("/") && path.length() > 0) //$NON-NLS-1$
+ path = path.substring(1);
+ if (path != null && path.length() > 0)
+ url = new URL(url, path);
+ }
+ return new HttpLaunchable(url);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+}
17 years, 5 months
JBoss Tools SVN: r2861 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-02 16:40:06 -0400 (Thu, 02 Aug 2007)
New Revision: 2861
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JBossServerViewExtension.java
Log:
wrong viewer refreshed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JBossServerViewExtension.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JBossServerViewExtension.java 2007-08-02 20:39:10 UTC (rev 2860)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JBossServerViewExtension.java 2007-08-02 20:40:06 UTC (rev 2861)
@@ -83,10 +83,11 @@
public void run() {
if( isEnabled() ) {
try {
- if( o == null )
- JBossServerView.getDefault().getServerFrame().getViewer().refresh(provider);
- else
- JBossServerView.getDefault().getServerFrame().getViewer().refresh(new ContentWrapper(o, provider));
+ if( o == null ) {
+ JBossServerView.getDefault().getExtensionFrame().getViewer().refresh(provider);
+ } else {
+ JBossServerView.getDefault().getExtensionFrame().getViewer().refresh(new ContentWrapper(o, provider));
+ }
} catch(Exception e) {
}
}
17 years, 5 months
JBoss Tools SVN: r2860 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-08-02 16:39:10 -0400 (Thu, 02 Aug 2007)
New Revision: 2860
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java
Log:
NPE
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java 2007-08-02 20:03:54 UTC (rev 2859)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java 2007-08-02 20:39:10 UTC (rev 2860)
@@ -99,7 +99,8 @@
public void run() {
DeployableServerBehavior behavior = (DeployableServerBehavior)
contentProvider.getServer().loadAdapter(DeployableServerBehavior.class, new NullProgressMonitor());
- behavior.publishOneModule(IServer.PUBLISH_FULL, selection.module, ServerBehaviourDelegate.CHANGED, new NullProgressMonitor());
+ if( behavior != null )
+ behavior.publishOneModule(IServer.PUBLISH_FULL, selection.module, ServerBehaviourDelegate.CHANGED, new NullProgressMonitor());
}
};
publishModuleAction.setText(Messages.PublishModuleText);
17 years, 5 months