geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1203020 [20/29] - in /geronimo/devtools/eclipse-plugin/branches/3.0-beta-1: eclipse/ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/application/ plugins/org.apache.geronimo...
Date Thu, 17 Nov 2011 02:19:27 GMT
Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java Thu Nov 17 02:19:12 2011
@@ -1,137 +1,137 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.st.v21.ui.internal;
-
-import org.apache.geronimo.runtime.common.log.Logger;
-import org.apache.geronimo.st.v21.ui.Activator;
-
-/**
- * Helper class to route trace output.
- *
- * @version $Rev: 471551 $ $Date: 2006-11-05 17:47:11 -0500 (Sun, 05 Nov 2006) $
- */
-public class Trace {
-
-    /**
-     * Finest trace event.
-     */
-    public static int INFO = 1;
-
-    /**
-     * Warning trace event.
-     */
-    public static int WARNING = 2;
-
-    /**
-     * error trace event.
-     */
-    public static int ERROR = 4;
-    /**
-     * cancel trace event.
-     */
-    public static int CANCEL = 8;
-    
-    private static Logger log;
-    static {
-    	log = Logger.getInstance();
-    }
-    /**
-     * Trace constructor comment.
-     */
-    private Trace() {
-        super();
-    }
-
-    /**
-     * Trace the given text.
-     * 
-     * @param level
-     *            the trace level
-     * @param s
-     *            a message
-     */
-    public static void trace(int level, String s, boolean opt) {
-        trace(level, s, null, opt);
-    }
-
-    /**
-     * Trace the given message and exception.
-     * 
-     * @param level
-     *            the trace level
-     * @param s
-     *            a message
-     * @param t
-     *            a throwable
-     */
-    public static void trace(int level, String s, Throwable t, boolean opt) {
-        if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
-            return;
-        if(opt) {
-        	log.trace(level, Activator.PLUGIN_ID, s, t);
-        }
-        if(Activator.console) {
-            System.out.println(Activator.PLUGIN_ID + ":  " + s);
-            if (t != null)
-                t.printStackTrace();
-        }
-    }
-
-    /**
-     * Trace the given message 
-     * 
-     * @param tracePoint
-     *            The trace point (e.g., "Exit", "Entry", "Constructor", etc....
-     *            
-     * @param classDotMethod
-     *            The class name + method name (e.g., "Class.method()")
-     *            
-     * @param parm1,2,3,4,5
-     *            Method parameters if the trace point is an "Entry"
-     *            or
-     *            Return value if the trace point is an "Exit"
-     */
-    public static void trace(String tracePoint, String classDotMethod, boolean opt) {
-        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()", opt);
-    }   
-    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1) {
-        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "] )" , opt);
-    }
-
-    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2) {
-        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
-                                                                 "parm2=[" + (parm2 == null ? null : parm2.toString()) + "] )" , opt );
-    }
-    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2, Object parm3) {
-        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
-                                                                 "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
-                                                                 "parm3=[" + (parm3 == null ? null : parm3.toString()) + "] )" , opt );
-    }
-    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4) {
-        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
-                                                                 "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
-                                                                 "parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
-                                                                 "parm4=[" + (parm4 == null ? null : parm4.toString()) + "] )" , opt );
-    }
-    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4, Object parm5) {
-        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
-                                                                 "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
-                                                                 "parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
-                                                                 "parm4=[" + (parm4 == null ? null : parm4.toString()) + "], " +
-                                                                 "parm5=[" + (parm5 == null ? null : parm5.toString()) + "] )" , opt );
-    }
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.internal;
+
+import org.apache.geronimo.runtime.common.log.Logger;
+import org.apache.geronimo.st.v21.ui.Activator;
+
+/**
+ * Helper class to route trace output.
+ *
+ * @version $Rev$ $Date$
+ */
+public class Trace {
+
+    /**
+     * Finest trace event.
+     */
+    public static int INFO = 1;
+
+    /**
+     * Warning trace event.
+     */
+    public static int WARNING = 2;
+
+    /**
+     * error trace event.
+     */
+    public static int ERROR = 4;
+    /**
+     * cancel trace event.
+     */
+    public static int CANCEL = 8;
+    
+    private static Logger log;
+    static {
+    	log = Logger.getInstance();
+    }
+    /**
+     * Trace constructor comment.
+     */
+    private Trace() {
+        super();
+    }
+
+    /**
+     * Trace the given text.
+     * 
+     * @param level
+     *            the trace level
+     * @param s
+     *            a message
+     */
+    public static void trace(int level, String s, boolean opt) {
+        trace(level, s, null, opt);
+    }
+
+    /**
+     * Trace the given message and exception.
+     * 
+     * @param level
+     *            the trace level
+     * @param s
+     *            a message
+     * @param t
+     *            a throwable
+     */
+    public static void trace(int level, String s, Throwable t, boolean opt) {
+        if (Activator.getDefault() == null || !Activator.getDefault().isDebugging())
+            return;
+        if(opt) {
+        	log.trace(level, Activator.PLUGIN_ID, s, t);
+        }
+        if(Activator.console) {
+            System.out.println(Activator.PLUGIN_ID + ":  " + s);
+            if (t != null)
+                t.printStackTrace();
+        }
+    }
+
+    /**
+     * Trace the given message 
+     * 
+     * @param tracePoint
+     *            The trace point (e.g., "Exit", "Entry", "Constructor", etc....
+     *            
+     * @param classDotMethod
+     *            The class name + method name (e.g., "Class.method()")
+     *            
+     * @param parm1,2,3,4,5
+     *            Method parameters if the trace point is an "Entry"
+     *            or
+     *            Return value if the trace point is an "Exit"
+     */
+    public static void trace(String tracePoint, String classDotMethod, boolean opt) {
+        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()", opt);
+    }   
+    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1) {
+        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "] )" , opt);
+    }
+
+    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2) {
+        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+                                                                 "parm2=[" + (parm2 == null ? null : parm2.toString()) + "] )" , opt );
+    }
+    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2, Object parm3) {
+        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+                                                                 "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
+                                                                 "parm3=[" + (parm3 == null ? null : parm3.toString()) + "] )" , opt );
+    }
+    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4) {
+        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+                                                                 "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
+                                                                 "parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
+                                                                 "parm4=[" + (parm4 == null ? null : parm4.toString()) + "] )" , opt );
+    }
+    public static void trace(String tracePoint, boolean opt, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4, Object parm5) {
+        trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+                                                                 "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
+                                                                 "parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
+                                                                 "parm4=[" + (parm4 == null ? null : parm4.toString()) + "], " +
+                                                                 "parm5=[" + (parm5 == null ? null : parm5.toString()) + "] )" , opt );
+    }
 }
\ No newline at end of file

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Trace.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java Thu Nov 17 02:19:12 2011
@@ -1,58 +1,58 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.st.v21.ui.pages;
-
-import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
-import org.apache.geronimo.st.v21.ui.sections.AppGeneralSection;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AppGeneralPage extends AbstractGeronimoFormPage {
-
-	public AppGeneralPage(FormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
-	 */
-	protected void fillBody(IManagedForm managedForm) {
-		managedForm.addPart(new AppGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
-	 */
-	public String getFormTitle() {
-		return CommonMessages.appGeneralPageTitle;
-	}
-
-	@Override
-	protected void triggerGeronimoServerInfoUpdate() {
-		GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
-	}
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.pages;
+
+import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
+import org.apache.geronimo.st.v21.ui.sections.AppGeneralSection;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class AppGeneralPage extends AbstractGeronimoFormPage {
+
+	public AppGeneralPage(FormEditor editor, String id, String title) {
+		super(editor, id, title);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+	 */
+	protected void fillBody(IManagedForm managedForm) {
+		managedForm.addPart(new AppGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
+	 */
+	public String getFormTitle() {
+		return CommonMessages.appGeneralPageTitle;
+	}
+
+	@Override
+	protected void triggerGeronimoServerInfoUpdate() {
+		GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java Thu Nov 17 02:19:12 2011
@@ -1,58 +1,58 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.st.v21.ui.pages;
-
-import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
-import org.apache.geronimo.st.v21.ui.sections.ConnectorGeneralSection;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConnectorOverviewPage extends AbstractGeronimoFormPage {
-
-	public ConnectorOverviewPage(FormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
-	 */
-	protected void fillBody(IManagedForm managedForm) {
-		managedForm.addPart(new ConnectorGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
-	 */
-	public String getFormTitle() {
-		return CommonMessages.connectorOverViewPageTitle;
-	}
-
-	@Override
-	protected void triggerGeronimoServerInfoUpdate() {
-		GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
-	}
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.pages;
+
+import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
+import org.apache.geronimo.st.v21.ui.sections.ConnectorGeneralSection;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ConnectorOverviewPage extends AbstractGeronimoFormPage {
+
+	public ConnectorOverviewPage(FormEditor editor, String id, String title) {
+		super(editor, id, title);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+	 */
+	protected void fillBody(IManagedForm managedForm) {
+		managedForm.addPart(new ConnectorGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
+	 */
+	public String getFormTitle() {
+		return CommonMessages.connectorOverViewPageTitle;
+	}
+
+	@Override
+	protected void triggerGeronimoServerInfoUpdate() {
+		GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java Thu Nov 17 02:19:12 2011
@@ -1,62 +1,62 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.st.v21.ui.pages;
-
-import org.apache.geronimo.jee.application.Application;
-import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
-import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
-import org.apache.geronimo.st.v21.ui.sections.DBPoolSection;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-/**
- * This page is added to a editor for
- * geronimo-application.xml,geronimo-web.xml,openejb-jar.xml It will contain two
- * sections,Database pool section and JMS resource section
- */
-public class ConnectorPage extends AbstractGeronimoFormPage {
-
-	public ConnectorPage(FormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	@Override
-	protected void fillBody(IManagedForm managedForm) {
-		Application application = (Application) ((AbstractGeronimoJAXBBasedEditor) getEditor())
-				.getRootElement().getValue();
-		managedForm.addPart(new DBPoolSection(getDeploymentPlan(), body,
-				toolkit, getStyle(), application.getExtModule()));	
-	}
-
-	protected GridLayout getLayout() {
-		GridLayout layout = super.getLayout();
-		layout.numColumns = 1;
-		return layout;
-	}
-
-	public String getFormTitle() {
-		return "Connector";//TODO
-	}
-
-	@Override
-	protected void triggerGeronimoServerInfoUpdate() {
-		GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
-	}
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.pages;
+
+import org.apache.geronimo.jee.application.Application;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
+import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
+import org.apache.geronimo.st.v21.ui.sections.DBPoolSection;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+/**
+ * This page is added to a editor for
+ * geronimo-application.xml,geronimo-web.xml,openejb-jar.xml It will contain two
+ * sections,Database pool section and JMS resource section
+ */
+public class ConnectorPage extends AbstractGeronimoFormPage {
+
+	public ConnectorPage(FormEditor editor, String id, String title) {
+		super(editor, id, title);
+	}
+
+	@Override
+	protected void fillBody(IManagedForm managedForm) {
+		Application application = (Application) ((AbstractGeronimoJAXBBasedEditor) getEditor())
+				.getRootElement().getValue();
+		managedForm.addPart(new DBPoolSection(getDeploymentPlan(), body,
+				toolkit, getStyle(), application.getExtModule()));	
+	}
+
+	protected GridLayout getLayout() {
+		GridLayout layout = super.getLayout();
+		layout.numColumns = 1;
+		return layout;
+	}
+
+	public String getFormTitle() {
+		return "Connector";//TODO
+	}
+
+	@Override
+	protected void triggerGeronimoServerInfoUpdate() {
+		GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java Thu Nov 17 02:19:12 2011
@@ -1,49 +1,49 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.st.v21.ui.pages;
-
-import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
-import org.apache.geronimo.st.v21.ui.sections.OpenEjbJarCMPSection;
-import org.apache.geronimo.st.v21.ui.sections.OpenEjbJarGeneralSection;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EjbOverviewPage extends AbstractGeronimoFormPage {
-
-    public EjbOverviewPage(FormEditor editor, String id, String title) {
-        super(editor, id, title);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
-     */
-    protected void fillBody(IManagedForm managedForm) {
-        managedForm.addPart(new OpenEjbJarGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
-        managedForm.addPart(new OpenEjbJarCMPSection(body, toolkit, getStyle(), getDeploymentPlan()));
-    }
-
-    @Override
-    protected void triggerGeronimoServerInfoUpdate() {
-        GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.pages;
+
+import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
+import org.apache.geronimo.st.v21.ui.sections.OpenEjbJarCMPSection;
+import org.apache.geronimo.st.v21.ui.sections.OpenEjbJarGeneralSection;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EjbOverviewPage extends AbstractGeronimoFormPage {
+
+    public EjbOverviewPage(FormEditor editor, String id, String title) {
+        super(editor, id, title);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+     */
+    protected void fillBody(IManagedForm managedForm) {
+        managedForm.addPart(new OpenEjbJarGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
+        managedForm.addPart(new OpenEjbJarCMPSection(body, toolkit, getStyle(), getDeploymentPlan()));
+    }
+
+    @Override
+    protected void triggerGeronimoServerInfoUpdate() {
+        GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java Thu Nov 17 02:19:12 2011
@@ -1,59 +1,59 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.st.v21.ui.pages;
-
-import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
-import org.apache.geronimo.st.v21.ui.sections.WebContainerSection;
-import org.apache.geronimo.st.v21.ui.sections.WebGeneralSection;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WebGeneralPage extends AbstractGeronimoFormPage {
-
-    public WebGeneralPage(FormEditor editor, String id, String title) {
-        super(editor, id, title);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
-     */
-    protected void fillBody(IManagedForm managedForm) {
-        managedForm.addPart(new WebGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
-        managedForm.addPart(new WebContainerSection(body, toolkit, getStyle(), getDeploymentPlan()));
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
-     */
-    public String getFormTitle() {
-        return CommonMessages.webGeneralPageTitle;
-    }
-
-    @Override
-    protected void triggerGeronimoServerInfoUpdate() {
-        GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.pages;
+
+import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
+import org.apache.geronimo.st.v21.core.GeronimoServerInfoManager;
+import org.apache.geronimo.st.v21.ui.sections.WebContainerSection;
+import org.apache.geronimo.st.v21.ui.sections.WebGeneralSection;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class WebGeneralPage extends AbstractGeronimoFormPage {
+
+    public WebGeneralPage(FormEditor editor, String id, String title) {
+        super(editor, id, title);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+     */
+    protected void fillBody(IManagedForm managedForm) {
+        managedForm.addPart(new WebGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
+        managedForm.addPart(new WebContainerSection(body, toolkit, getStyle(), getDeploymentPlan()));
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
+     */
+    public String getFormTitle() {
+        return CommonMessages.webGeneralPageTitle;
+    }
+
+    @Override
+    protected void triggerGeronimoServerInfoUpdate() {
+        GeronimoServerInfoManager.getProvider(getRuntimeVersion()).updateInfo();
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppGeneralSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppGeneralSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppGeneralSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/CommonGeneralSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/CommonGeneralSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/CommonGeneralSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ConnectorGeneralSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ConnectorGeneralSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ConnectorGeneralSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DBPoolSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DBPoolSection.java?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DBPoolSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DBPoolSection.java Thu Nov 17 02:19:12 2011
@@ -1,196 +1,196 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.st.v21.ui.sections;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-
-import org.apache.geronimo.jee.application.ExtModule;
-import org.apache.geronimo.jee.connector.Connector;
-import org.apache.geronimo.jee.deployment.Gbean;
-import org.apache.geronimo.jee.deployment.Pattern;
-import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.ui.internal.Messages;
-import org.apache.geronimo.st.ui.sections.AbstractTableSection;
-import org.apache.geronimo.st.ui.sections.AbstractListSection.ContentProvider;
-import org.apache.geronimo.st.ui.sections.AbstractListSection.LabelProvider;
-import org.apache.geronimo.st.v21.ui.pages.ConnectorPage;
-import org.apache.geronimo.st.v21.ui.wizards.DBPoolWizard;
-import org.apache.geronimo.st.v21.ui.wizards.ExtModuleWizard;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DBPoolSection extends AbstractTableSection {
-
-    public DBPoolSection(JAXBElement plan, Composite parent,
-        FormToolkit toolkit, int style, List extModules) {
-    super(plan, parent, toolkit, style);
-    this.objectContainer = extModules;
-    COLUMN_NAMES = new String[] { Messages.wizardDatabasePoolConnector, Messages.wizardDatabasePoolExternalPath };// TODO
-                                      // put
-                                      // into
-                                      // message
-    createClient();
-    }
-
-    @Override
-    public String getDescription() {
-    return Messages.wizardDatabasePoolDescription;// TODO put into
-                               // message
-    }
-
-    @Override
-    public Class getTableEntryObjectType() {
-    return ExtModule.class;// TODO put into message
-    }
-
-    @Override
-    public String getTitle() {
-    return Messages.wizardDatabasePoolTitle;// TODO put into message
-    }
-
-    @Override
-    protected Wizard getWizard() {
-    return new DBPoolWizard(this);
-    }
-
-    protected void notifyOthers() {
-    notifyExtModuleSectionToRefresh();
-    }
-
-    /*
-     * After add, remove, edit dbpool ext-module, notify the extModuleSection to
-     * refresh. If the deploymentpage has not been initialized, catch a
-     * NullPointerException and just ignore it.
-     */
-    private void notifyExtModuleSectionToRefresh() {
-    try {
-        ConnectorPage connectorPage = (ConnectorPage) this.getManagedForm()
-            .getContainer();
-        FormEditor editor = connectorPage.getEditor();
-        IFormPart[] parts = editor.findPage("deploymentpage")
-            .getManagedForm().getParts();
-        ExtModuleSection extModuleSection = null;
-        for (IFormPart part : parts) {
-        if (ExtModuleSection.class.isInstance(part)) {
-            extModuleSection = (ExtModuleSection) part;
-        }
-        }
-        extModuleSection.getViewer().refresh();
-    } catch (NullPointerException e) {
-        // Ignore, this exception happens when the deployment page hasn't
-        // been initialized
-    }
-    }
-
-    @Override
-    public ITreeContentProvider getContentProvider() {
-    return new ContentProvider() {
-        @Override
-        public Object[] getElements(Object inputElement) {
-        List<ExtModule> result = new ArrayList<ExtModule>();
-        List extModules = getObjectContainer();
-        Iterator it = extModules.iterator();
-        while (it.hasNext()) {
-            ExtModule current = (ExtModule) it.next();
-            if (isDBPoolConnectorExtModule(current)) {
-            result.add(current);
-            }
-        }
-        return result.toArray();
-        }
-    };
-    }
-
-    private boolean isDBPoolConnectorExtModule(ExtModule extModule) {
-    boolean result = false;
-    JAXBElement any = (JAXBElement) extModule.getAny();
-    if (any == null)
-        return false;
-    Object anyValue = any.getValue();
-    if (Connector.class.isInstance(anyValue)) {
-        Connector connector = (Connector) anyValue;
-        try {
-        // if the <ext-module/> contains <connectionfactory-interface/>
-        // which value is "javax.sql.DataSource",then it is a dbpool
-        // ext-module.
-        String connectionfactoryInterface = connector
-            .getResourceadapter().get(0)
-            .getOutboundResourceadapter().getConnectionDefinition()
-            .get(0).getConnectionfactoryInterface();
-        if (connectionfactoryInterface.trim().equals(
-            "javax.sql.DataSource")) {
-            result = true;
-        }
-        } catch (NullPointerException e) {
-        // e.printStackTrace();
-        }
-    }
-    return result;
-    }
-
-    @Override
-    public ITableLabelProvider getLabelProvider() {
-    return new LabelProvider() {
-        @Override
-        public String getColumnText(Object element, int columnIndex) {
-        if (ExtModule.class.isInstance(element)) {
-            ExtModule extModule = (ExtModule) element;
-            switch (columnIndex) {
-            case 0:// connector
-            if (extModule.getConnector() != null) {
-                return extModule.getConnector().getValue();
-            }
-            return "";
-            case 1:// external-path
-            Pattern externalPath = extModule.getExternalPath();
-            if (externalPath != null) {
-                String groupId = externalPath.getGroupId() != null ? externalPath
-                    .getGroupId()
-                    : "";
-                String artifactId = externalPath.getArtifactId() != null ? externalPath
-                    .getArtifactId()
-                    : "";
-                String version = externalPath.getVersion() != null ? externalPath
-                    .getVersion()
-                    : "";
-                String type = externalPath.getType() != null ? externalPath
-                    .getType()
-                    : "";
-                return groupId + "/" + artifactId + "/" + version
-                    + "/" + type;
-            }
-            return "";
-            }
-        }
-        return null;
-        }
-    };
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.sections;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.jee.application.ExtModule;
+import org.apache.geronimo.jee.connector.Connector;
+import org.apache.geronimo.jee.deployment.Gbean;
+import org.apache.geronimo.jee.deployment.Pattern;
+import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
+import org.apache.geronimo.st.ui.sections.AbstractTableSection;
+import org.apache.geronimo.st.ui.sections.AbstractListSection.ContentProvider;
+import org.apache.geronimo.st.ui.sections.AbstractListSection.LabelProvider;
+import org.apache.geronimo.st.v21.ui.pages.ConnectorPage;
+import org.apache.geronimo.st.v21.ui.wizards.DBPoolWizard;
+import org.apache.geronimo.st.v21.ui.wizards.ExtModuleWizard;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.ui.forms.IFormPart;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DBPoolSection extends AbstractTableSection {
+
+    public DBPoolSection(JAXBElement plan, Composite parent,
+        FormToolkit toolkit, int style, List extModules) {
+    super(plan, parent, toolkit, style);
+    this.objectContainer = extModules;
+    COLUMN_NAMES = new String[] { Messages.wizardDatabasePoolConnector, Messages.wizardDatabasePoolExternalPath };// TODO
+                                      // put
+                                      // into
+                                      // message
+    createClient();
+    }
+
+    @Override
+    public String getDescription() {
+    return Messages.wizardDatabasePoolDescription;// TODO put into
+                               // message
+    }
+
+    @Override
+    public Class getTableEntryObjectType() {
+    return ExtModule.class;// TODO put into message
+    }
+
+    @Override
+    public String getTitle() {
+    return Messages.wizardDatabasePoolTitle;// TODO put into message
+    }
+
+    @Override
+    protected Wizard getWizard() {
+    return new DBPoolWizard(this);
+    }
+
+    protected void notifyOthers() {
+    notifyExtModuleSectionToRefresh();
+    }
+
+    /*
+     * After add, remove, edit dbpool ext-module, notify the extModuleSection to
+     * refresh. If the deploymentpage has not been initialized, catch a
+     * NullPointerException and just ignore it.
+     */
+    private void notifyExtModuleSectionToRefresh() {
+    try {
+        ConnectorPage connectorPage = (ConnectorPage) this.getManagedForm()
+            .getContainer();
+        FormEditor editor = connectorPage.getEditor();
+        IFormPart[] parts = editor.findPage("deploymentpage")
+            .getManagedForm().getParts();
+        ExtModuleSection extModuleSection = null;
+        for (IFormPart part : parts) {
+        if (ExtModuleSection.class.isInstance(part)) {
+            extModuleSection = (ExtModuleSection) part;
+        }
+        }
+        extModuleSection.getViewer().refresh();
+    } catch (NullPointerException e) {
+        // Ignore, this exception happens when the deployment page hasn't
+        // been initialized
+    }
+    }
+
+    @Override
+    public ITreeContentProvider getContentProvider() {
+    return new ContentProvider() {
+        @Override
+        public Object[] getElements(Object inputElement) {
+        List<ExtModule> result = new ArrayList<ExtModule>();
+        List extModules = getObjectContainer();
+        Iterator it = extModules.iterator();
+        while (it.hasNext()) {
+            ExtModule current = (ExtModule) it.next();
+            if (isDBPoolConnectorExtModule(current)) {
+            result.add(current);
+            }
+        }
+        return result.toArray();
+        }
+    };
+    }
+
+    private boolean isDBPoolConnectorExtModule(ExtModule extModule) {
+    boolean result = false;
+    JAXBElement any = (JAXBElement) extModule.getAny();
+    if (any == null)
+        return false;
+    Object anyValue = any.getValue();
+    if (Connector.class.isInstance(anyValue)) {
+        Connector connector = (Connector) anyValue;
+        try {
+        // if the <ext-module/> contains <connectionfactory-interface/>
+        // which value is "javax.sql.DataSource",then it is a dbpool
+        // ext-module.
+        String connectionfactoryInterface = connector
+            .getResourceadapter().get(0)
+            .getOutboundResourceadapter().getConnectionDefinition()
+            .get(0).getConnectionfactoryInterface();
+        if (connectionfactoryInterface.trim().equals(
+            "javax.sql.DataSource")) {
+            result = true;
+        }
+        } catch (NullPointerException e) {
+        // e.printStackTrace();
+        }
+    }
+    return result;
+    }
+
+    @Override
+    public ITableLabelProvider getLabelProvider() {
+    return new LabelProvider() {
+        @Override
+        public String getColumnText(Object element, int columnIndex) {
+        if (ExtModule.class.isInstance(element)) {
+            ExtModule extModule = (ExtModule) element;
+            switch (columnIndex) {
+            case 0:// connector
+            if (extModule.getConnector() != null) {
+                return extModule.getConnector().getValue();
+            }
+            return "";
+            case 1:// external-path
+            Pattern externalPath = extModule.getExternalPath();
+            if (externalPath != null) {
+                String groupId = externalPath.getGroupId() != null ? externalPath
+                    .getGroupId()
+                    : "";
+                String artifactId = externalPath.getArtifactId() != null ? externalPath
+                    .getArtifactId()
+                    : "";
+                String version = externalPath.getVersion() != null ? externalPath
+                    .getVersion()
+                    : "";
+                String type = externalPath.getType() != null ? externalPath
+                    .getType()
+                    : "";
+                return groupId + "/" + artifactId + "/" + version
+                    + "/" + type;
+            }
+            return "";
+            }
+        }
+        return null;
+        }
+    };
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DBPoolSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DBPoolSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DBPoolSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DependencySection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbLocalRefSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbLocalRefSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbLocalRefSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbRefSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbRefSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbRefSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java Thu Nov 17 02:19:12 2011
@@ -40,7 +40,7 @@ import org.eclipse.ui.forms.editor.FormE
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
 /**
- * @version $Rev: 688452 $ $Date: 2008-08-24 01:56:20 -0400 (Sun, 24 Aug 2008) $
+ * @version $Rev$ $Date$
  */
 public class GBeanSection extends AbstractTreeSection {
 

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ResourceEnvRefSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ResourceEnvRefSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ResourceEnvRefSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ResourceRefSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ResourceRefSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ResourceRefSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRealmSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRealmSection.java?rev=1203020&r1=1203019&r2=1203020&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRealmSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRealmSection.java Thu Nov 17 02:19:12 2011
@@ -1,194 +1,194 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.geronimo.st.v21.ui.sections;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-
-import org.apache.geronimo.jee.deployment.Attribute;
-import org.apache.geronimo.jee.deployment.Gbean;
-import org.apache.geronimo.jee.deployment.XmlAttributeType;
-import org.apache.geronimo.jee.loginconfig.LoginConfig;
-import org.apache.geronimo.jee.loginconfig.LoginModule;
-import org.apache.geronimo.st.ui.sections.AbstractTableSection;
-import org.apache.geronimo.st.v21.ui.pages.SecurityPage;
-import org.apache.geronimo.st.v21.ui.wizards.SecurityRealmWizard;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class SecurityRealmSection extends AbstractTableSection {
-    public SecurityRealmSection(JAXBElement plan, List gbeans,
-	    Composite parent, FormToolkit toolkit, int style) {
-	super(plan, parent, toolkit, style);
-	this.objectContainer = gbeans;
-	COLUMN_NAMES = new String[] { "Security Realm Name",
-		"Login Module Class" };// TODO put into message
-	createClient();
-    }
-
-    @Override
-    public String getDescription() {
-	return "The following security realms are defined:";// TODO put into
-	// message
-    }
-
-    @Override
-    public Class getTableEntryObjectType() {
-	return JAXBElement.class;
-    }
-
-    @Override
-    public String getTitle() {
-	return "Security Realm";// TODO put into message
-    }
-
-    @Override
-    protected Wizard getWizard() {
-	return new SecurityRealmWizard(this);
-    }
-
-    protected void notifyOthers() {
-	notifyGBeanSectionToRefresh();
-    }
-
-    /*
-     * After add, remove, edit realm gbean, notify the gbean section to refresh.
-     * If the deploymentpage has not been initialized, catch a
-     * NullPointerException and just ignore it.
-     */
-    private void notifyGBeanSectionToRefresh() {
-	try {
-	    SecurityPage securityPage = (SecurityPage) this.getManagedForm()
-		    .getContainer();
-	    FormEditor editor = securityPage.getEditor();
-	    IFormPart[] parts = editor.findPage("deploymentpage")
-		    .getManagedForm().getParts();
-	    GBeanSection gbeanSection = null;
-	    for (IFormPart part : parts) {
-		if (GBeanSection.class.isInstance(part)) {
-		    gbeanSection = (GBeanSection) part;
-		}
-	    }
-	    gbeanSection.getViewer().refresh();
-	} catch (NullPointerException e) {
-	    // Ignore, this exception happens when the deployment page hasn't
-	    // been initialized
-	}
-    }
-
-    @Override
-    public ITreeContentProvider getContentProvider() {
-	return new ContentProvider() {
-	    @Override
-	    public Object[] getElements(Object inputElement) {
-		List<JAXBElement<?>> result = new ArrayList<JAXBElement<?>>();
-		List<?> list = getObjectContainer();
-		for (Iterator<?> it = list.iterator(); it.hasNext();) {
-		    JAXBElement<?> current = (JAXBElement<?>) it.next();
-		    if (isSecurityRealmGbean((Gbean) current.getValue())) {
-			result.add(current);
-		    }
-		}
-		return result.toArray();
-	    }
-	};
-    }
-
-    private boolean isSecurityRealmGbean(Gbean gbean) {
-	return "org.apache.geronimo.security.realm.GenericSecurityRealm"
-		.equals(gbean.getClazz());
-    }
-
-    @Override
-    public ITableLabelProvider getLabelProvider() {
-	return new LabelProvider() {
-	    @Override
-	    public String getColumnText(Object element, int columnIndex) {
-		// System.out.println("here");
-		if (JAXBElement.class.isInstance(element)) {
-		    Object value = ((JAXBElement<?>) element).getValue();
-		    if (Gbean.class.isInstance(value)) {
-			Gbean gbean = (Gbean) value;
-			switch (columnIndex) {
-			case 0:// security realm name
-			    if (getGbeanAttributeValue(gbean, "realmName") != null) {
-				return getGbeanAttributeValue(gbean,
-					"realmName");
-			    }
-			    return "";
-			case 1:// login module class
-			    if (getSecurityRealmGbeanLoginModuleClass(gbean) != null) {
-				return getSecurityRealmGbeanLoginModuleClass(gbean);
-			    }
-			    return "";
-			}
-		    }
-		}
-		return null;
-	    }
-	};
-    }
-
-    private String getGbeanAttributeValue(Gbean gbean, String attributeName) {
-	try {
-	    List<JAXBElement<?>> elelist = gbean
-		    .getAttributeOrXmlAttributeOrReference();
-	    for (JAXBElement<?> ele : elelist) {
-		if (Attribute.class.isInstance(ele.getValue())
-			&& ((Attribute) ele.getValue()).getName().equals(
-				attributeName)) {
-		    return ((Attribute) ele.getValue()).getValue();
-		}
-	    }
-	} catch (NullPointerException e) {
-	    // ignore
-	}
-	return null;
-    }
-
-    private String getSecurityRealmGbeanLoginModuleClass(Gbean gbean) {
-	if (isSecurityRealmGbean(gbean)) {
-	    try {
-		List<JAXBElement<?>> elelist = gbean
-			.getAttributeOrXmlAttributeOrReference();
-		for (JAXBElement<?> ele : elelist) {
-		    if (XmlAttributeType.class.isInstance(ele.getValue())
-			    && ((XmlAttributeType) ele.getValue()).getName()
-				    .equals("LoginModuleConfiguration")) {
-			LoginModule loginModule = (LoginModule) ((LoginConfig) ((XmlAttributeType) ele
-				.getValue()).getAny())
-				.getLoginModuleRefOrLoginModule().get(0);
-			return loginModule.getLoginModuleClass();
-		    }
-		}
-		return null;
-	    } catch (NullPointerException e) {
-		// ignore
-	    }
-	}
-	return null;
-    }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.st.v21.ui.sections;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.jee.deployment.Attribute;
+import org.apache.geronimo.jee.deployment.Gbean;
+import org.apache.geronimo.jee.deployment.XmlAttributeType;
+import org.apache.geronimo.jee.loginconfig.LoginConfig;
+import org.apache.geronimo.jee.loginconfig.LoginModule;
+import org.apache.geronimo.st.ui.sections.AbstractTableSection;
+import org.apache.geronimo.st.v21.ui.pages.SecurityPage;
+import org.apache.geronimo.st.v21.ui.wizards.SecurityRealmWizard;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.IFormPart;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+
+public class SecurityRealmSection extends AbstractTableSection {
+    public SecurityRealmSection(JAXBElement plan, List gbeans,
+	    Composite parent, FormToolkit toolkit, int style) {
+	super(plan, parent, toolkit, style);
+	this.objectContainer = gbeans;
+	COLUMN_NAMES = new String[] { "Security Realm Name",
+		"Login Module Class" };// TODO put into message
+	createClient();
+    }
+
+    @Override
+    public String getDescription() {
+	return "The following security realms are defined:";// TODO put into
+	// message
+    }
+
+    @Override
+    public Class getTableEntryObjectType() {
+	return JAXBElement.class;
+    }
+
+    @Override
+    public String getTitle() {
+	return "Security Realm";// TODO put into message
+    }
+
+    @Override
+    protected Wizard getWizard() {
+	return new SecurityRealmWizard(this);
+    }
+
+    protected void notifyOthers() {
+	notifyGBeanSectionToRefresh();
+    }
+
+    /*
+     * After add, remove, edit realm gbean, notify the gbean section to refresh.
+     * If the deploymentpage has not been initialized, catch a
+     * NullPointerException and just ignore it.
+     */
+    private void notifyGBeanSectionToRefresh() {
+	try {
+	    SecurityPage securityPage = (SecurityPage) this.getManagedForm()
+		    .getContainer();
+	    FormEditor editor = securityPage.getEditor();
+	    IFormPart[] parts = editor.findPage("deploymentpage")
+		    .getManagedForm().getParts();
+	    GBeanSection gbeanSection = null;
+	    for (IFormPart part : parts) {
+		if (GBeanSection.class.isInstance(part)) {
+		    gbeanSection = (GBeanSection) part;
+		}
+	    }
+	    gbeanSection.getViewer().refresh();
+	} catch (NullPointerException e) {
+	    // Ignore, this exception happens when the deployment page hasn't
+	    // been initialized
+	}
+    }
+
+    @Override
+    public ITreeContentProvider getContentProvider() {
+	return new ContentProvider() {
+	    @Override
+	    public Object[] getElements(Object inputElement) {
+		List<JAXBElement<?>> result = new ArrayList<JAXBElement<?>>();
+		List<?> list = getObjectContainer();
+		for (Iterator<?> it = list.iterator(); it.hasNext();) {
+		    JAXBElement<?> current = (JAXBElement<?>) it.next();
+		    if (isSecurityRealmGbean((Gbean) current.getValue())) {
+			result.add(current);
+		    }
+		}
+		return result.toArray();
+	    }
+	};
+    }
+
+    private boolean isSecurityRealmGbean(Gbean gbean) {
+	return "org.apache.geronimo.security.realm.GenericSecurityRealm"
+		.equals(gbean.getClazz());
+    }
+
+    @Override
+    public ITableLabelProvider getLabelProvider() {
+	return new LabelProvider() {
+	    @Override
+	    public String getColumnText(Object element, int columnIndex) {
+		// System.out.println("here");
+		if (JAXBElement.class.isInstance(element)) {
+		    Object value = ((JAXBElement<?>) element).getValue();
+		    if (Gbean.class.isInstance(value)) {
+			Gbean gbean = (Gbean) value;
+			switch (columnIndex) {
+			case 0:// security realm name
+			    if (getGbeanAttributeValue(gbean, "realmName") != null) {
+				return getGbeanAttributeValue(gbean,
+					"realmName");
+			    }
+			    return "";
+			case 1:// login module class
+			    if (getSecurityRealmGbeanLoginModuleClass(gbean) != null) {
+				return getSecurityRealmGbeanLoginModuleClass(gbean);
+			    }
+			    return "";
+			}
+		    }
+		}
+		return null;
+	    }
+	};
+    }
+
+    private String getGbeanAttributeValue(Gbean gbean, String attributeName) {
+	try {
+	    List<JAXBElement<?>> elelist = gbean
+		    .getAttributeOrXmlAttributeOrReference();
+	    for (JAXBElement<?> ele : elelist) {
+		if (Attribute.class.isInstance(ele.getValue())
+			&& ((Attribute) ele.getValue()).getName().equals(
+				attributeName)) {
+		    return ((Attribute) ele.getValue()).getValue();
+		}
+	    }
+	} catch (NullPointerException e) {
+	    // ignore
+	}
+	return null;
+    }
+
+    private String getSecurityRealmGbeanLoginModuleClass(Gbean gbean) {
+	if (isSecurityRealmGbean(gbean)) {
+	    try {
+		List<JAXBElement<?>> elelist = gbean
+			.getAttributeOrXmlAttributeOrReference();
+		for (JAXBElement<?> ele : elelist) {
+		    if (XmlAttributeType.class.isInstance(ele.getValue())
+			    && ((XmlAttributeType) ele.getValue()).getName()
+				    .equals("LoginModuleConfiguration")) {
+			LoginModule loginModule = (LoginModule) ((LoginConfig) ((XmlAttributeType) ele
+				.getValue()).getAny())
+				.getLoginModuleRefOrLoginModule().get(0);
+			return loginModule.getLoginModuleClass();
+		    }
+		}
+		return null;
+	    } catch (NullPointerException e) {
+		// ignore
+	    }
+	}
+	return null;
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRealmSection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRealmSection.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0-beta-1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRealmSection.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message