JBoss Tools SVN: r11393 - in branches/jbosstools-3.0.0.Beta1: documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-10-31 06:56:13 -0400 (Fri, 31 Oct 2008)
New Revision: 11393
Modified:
branches/jbosstools-3.0.0.Beta1/as/docs/reference/en/master_output.xml
branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl
branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl
branches/jbosstools-3.0.0.Beta1/hibernatetools/docs/reference/en/master_output.xml
branches/jbosstools-3.0.0.Beta1/jsf/docs/userguide/en/master_output.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-463
html and pdf are fixed, deleted diff markers are not rendered, marker in pdf are corrected, the version is not corrupted
Modified: branches/jbosstools-3.0.0.Beta1/as/docs/reference/en/master_output.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/docs/reference/en/master_output.xml 2008-10-31 10:55:42 UTC (rev 11392)
+++ branches/jbosstools-3.0.0.Beta1/as/docs/reference/en/master_output.xml 2008-10-31 10:56:13 UTC (rev 11393)
@@ -576,7 +576,7 @@
<para>Now, let's get to know with both of the <property moreinfo="none">JBoss Server
View</property> parts.</para>
- <section role="updated">
+ <section>
<title>Top Part of the JBoss Server View</title>
<para>In the top part of the <property moreinfo="none">JBoss Server View</property> all declared servers
are represented as well as their current states, that is, whether they are started
@@ -1701,7 +1701,7 @@
</chapter>
-<chapter id="tptp_support" role="new" xml:base="file:///home/ochikvina/WORK/for_compare/trunk/as/docs/reference/en/modules/tptp_support.xml">
+<chapter id="tptp_support" xml:base="file:///home/ochikvina/WORK/for_compare/trunk/as/docs/reference/en/modules/tptp_support.xml">
<title>TPTP Support</title>
<para>This chapter provides an overview on how to enable TPTP Profiling for <property moreinfo="none">JBoss
AS</property> adapters in <property moreinfo="none">JBoss Tools</property>.</para>
Modified: branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl
===================================================================
--- branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2008-10-31 10:55:42 UTC (rev 11392)
+++ branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2008-10-31 10:56:13 UTC (rev 11393)
@@ -6,7 +6,7 @@
Author: Mark Newton <mark.newton(a)jboss.org>
-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:diffmk="http://diffmk.sf.net/ns/diff">
<xsl:import href="classpath:/xslt/com/jboss/pdf.xsl"/>
@@ -123,5 +123,20 @@
<xsl:value-of select="$currant"/>
</fo:inline>
</xsl:template>
+
+
+<xsl:template match="//diffmk:wrapper">
+ <xsl:choose>
+ <xsl:when test="@diffmk:change='deleted'">
+ <fo:inline> </fo:inline>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:inline background-color="#cce2f6">
+ <xsl:value-of select="."/>
+ </fo:inline>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
</xsl:stylesheet>
Modified: branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl
===================================================================
--- branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2008-10-31 10:55:42 UTC (rev 11392)
+++ branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2008-10-31 10:56:13 UTC (rev 11393)
@@ -6,7 +6,7 @@
Author: Mark Newton <mark.newton(a)jboss.org>
-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:diffmk="http://diffmk.sf.net/ns/diff" >
<xsl:import href="classpath:/xslt/org/jboss/pdf.xsl"/>
@@ -30,5 +30,18 @@
<xsl:value-of select="$currant"/>
</fo:inline>
</xsl:template>
-
+
+<xsl:template match="//diffmk:wrapper">
+ <xsl:choose>
+ <xsl:when test="@diffmk:change='deleted'">
+ <fo:inline> </fo:inline>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:inline background-color="#cce2f6">
+ <xsl:value-of select="."/><xsl:text> </xsl:text>
+ </fo:inline>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
</xsl:stylesheet>
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/docs/reference/en/master_output.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/docs/reference/en/master_output.xml 2008-10-31 10:55:42 UTC (rev 11392)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/docs/reference/en/master_output.xml 2008-10-31 10:56:13 UTC (rev 11393)
@@ -537,7 +537,7 @@
</emphasis> for the basis of a Console configuration.</para>
</section>
- <section id="console_conf" role="updated">
+ <section id="console_conf">
<title>Creating a Hibernate Console Configuration</title>
<para>A Console configuration describes how the <property moreinfo="none">Hibernate plugin</property> should
@@ -2141,7 +2141,7 @@
</section>
</section>
- <section diffmk:change="added" id="dali_integration" role="new">
+ <section diffmk:change="added" id="dali_integration">
<title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Hibernate support for Dali plugins in Eclipse WTP</diffmk:wrapper></title>
<para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Starting from 3.0.0 Alpha1 version of </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools</diffmk:wrapper></property> <diffmk:wrapper diffmk:change="added">Hibernate plugins
Modified: branches/jbosstools-3.0.0.Beta1/jsf/docs/userguide/en/master_output.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/docs/userguide/en/master_output.xml 2008-10-31 10:55:42 UTC (rev 11392)
+++ branches/jbosstools-3.0.0.Beta1/jsf/docs/userguide/en/master_output.xml 2008-10-31 10:56:13 UTC (rev 11393)
@@ -2532,7 +2532,7 @@
</section>
</section>
</section>
- <section id="RichFacesSupport" role="updated">
+ <section id="RichFacesSupport">
<?dbhtml filename="RichFacesSupport.html"?>
<title>RichFaces Support</title>
<para><property moreinfo="none"><diffmk:wrapper diffmk:change="changed">JBoss Developer Studio</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> comes with a tight integration with </diffmk:wrapper><ulink url="http://labs.jboss.com/jbossrichfaces/"><diffmk:wrapper diffmk:change="changed">RichFaces component framework</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">.
15 years, 5 months
JBoss Tools SVN: r11392 - workspace/examples.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-10-31 06:55:42 -0400 (Fri, 31 Oct 2008)
New Revision: 11392
Modified:
workspace/examples/projectExamples.xml
Log:
add ESB helloworld action sample
Modified: workspace/examples/projectExamples.xml
===================================================================
--- workspace/examples/projectExamples.xml 2008-10-31 10:55:31 UTC (rev 11391)
+++ workspace/examples/projectExamples.xml 2008-10-31 10:55:42 UTC (rev 11392)
@@ -132,7 +132,7 @@
<name>helloworld</name>
<shortDescription>JBoss ESB HelloWorld Example - ESB</shortDescription>
<description>This example is to prove that the ESB is is properly configured and happy.
- As well as to demonstrate the needed minimal files to make a basic ESB component execute.</description>
+As well as to demonstrate the needed minimal files to make a basic ESB component execute.</description>
<size>59000</size>
<url>
http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel...
@@ -143,11 +143,35 @@
<category>ESB</category>
<name>helloworld_testclient</name>
<shortDescription>JBoss ESB HelloWorld Example - Client</shortDescription>
- <description>This example is to demonstrate how to invoke the deployed HelloWorld ESB. It requires the helloworld.</description>
+ <description>This example is to demonstrate how to invoke the deployed HelloWorld ESB. It requires the helloworld project.</description>
<size>1000000</size>
<url>
http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel...
</url>
</project>
+
+ <project>
+ <category>ESB</category>
+ <name>helloworld_action</name>
+ <shortDescription>JBoss ESB HelloWorld Action Example - ESB</shortDescription>
+ <description>This sample is to demonstrate the use of multiple action invocations from a single configuration. You can use
+ a single Action class and make multiple method calls or use multiple Action
+ classes.</description>
+ <size>71000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB</category>
+ <name>helloworld_action_testclient</name>
+ <shortDescription>JBoss ESB HelloWorld Action Example - Client</shortDescription>
+ <description>This sample is to test the deployed helloworld_action ESB. It requires the helloworld_action project</description>
+ <size>71000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel...
+ </url>
+ </project>
</projects>
\ No newline at end of file
15 years, 5 months
JBoss Tools SVN: r11391 - workspace/Denny/esb-example.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-10-31 06:55:31 -0400 (Fri, 31 Oct 2008)
New Revision: 11391
Added:
workspace/Denny/esb-example/helloworld_action.zip
workspace/Denny/esb-example/helloworld_action_testclient.zip
Log:
add ESB helloworld action sample
Added: workspace/Denny/esb-example/helloworld_action.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/helloworld_action.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/Denny/esb-example/helloworld_action_testclient.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/helloworld_action_testclient.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 5 months
JBoss Tools SVN: r11390 - in branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt: org/jboss/tools and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-10-31 06:30:10 -0400 (Fri, 31 Oct 2008)
New Revision: 11390
Modified:
branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl
branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl
Log:
https://jira.jboss.org/jira/browse/JBDS-463
html is fixed, deleted diff markers are not rendered
Modified: branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl
===================================================================
--- branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2008-10-31 10:19:32 UTC (rev 11389)
+++ branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2008-10-31 10:30:10 UTC (rev 11390)
@@ -130,13 +130,22 @@
</xsl:call-template>
</xsl:template>
- <!-- XHTML and PDF -->
+
+<!-- XHTML and PDF -->
<xsl:template match="//diffmk:wrapper">
- <span class="diffmkwrapper">
- <xsl:value-of select="."/>
- </span>
+ <xsl:choose>
+ <xsl:when test="@diffmk:change='deleted'">
+ <xsl:text> </xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <span class="diffmkwrapper">
+ <xsl:value-of select="."/>
+ </span>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
+
<!--xsl:template match="//node()[@diffmk:change]">
<xsl:choose>
Modified: branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl
===================================================================
--- branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2008-10-31 10:19:32 UTC (rev 11389)
+++ branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2008-10-31 10:30:10 UTC (rev 11390)
@@ -119,14 +119,21 @@
</a>
</span>
</xsl:template>
- <!-- XHTML and PDF -->
+
+<!-- XHTML and PDF -->
<xsl:template match="//diffmk:wrapper">
- <span class="diffmkwrapper">
- <xsl:value-of select="."/>
- </span>
+ <xsl:choose>
+ <xsl:when test="@diffmk:change='deleted'">
+ <xsl:text> </xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <span class="diffmkwrapper">
+ <xsl:value-of select="."/>
+ </span>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
-
<!--xsl:template match="//node()[@diffmk:change]">
<xsl:choose>
<xsl:when test="local-name()='note' or local-name()='tip' or local-name()='important' or local-name()='warning' or local-name()='caution'">
15 years, 5 months
JBoss Tools SVN: r11389 - workspace/examples.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-10-31 06:19:32 -0400 (Fri, 31 Oct 2008)
New Revision: 11389
Modified:
workspace/examples/projectExamples.xml
Log:
add ESB helloworld sample
Modified: workspace/examples/projectExamples.xml
===================================================================
--- workspace/examples/projectExamples.xml 2008-10-31 10:07:06 UTC (rev 11388)
+++ workspace/examples/projectExamples.xml 2008-10-31 10:19:32 UTC (rev 11389)
@@ -126,5 +126,28 @@
http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl...
</url>
</project>
+
+ <project>
+ <category>ESB</category>
+ <name>helloworld</name>
+ <shortDescription>JBoss ESB HelloWorld Example - ESB</shortDescription>
+ <description>This example is to prove that the ESB is is properly configured and happy.
+ As well as to demonstrate the needed minimal files to make a basic ESB component execute.</description>
+ <size>59000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel...
+ </url>
+ </project>
+
+ <project>
+ <category>ESB</category>
+ <name>helloworld_testclient</name>
+ <shortDescription>JBoss ESB HelloWorld Example - Client</shortDescription>
+ <description>This example is to demonstrate how to invoke the deployed HelloWorld ESB. It requires the helloworld.</description>
+ <size>1000000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel...
+ </url>
+ </project>
</projects>
\ No newline at end of file
15 years, 5 months
JBoss Tools SVN: r11388 - workspace/Denny/esb-example.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-10-31 06:07:06 -0400 (Fri, 31 Oct 2008)
New Revision: 11388
Added:
workspace/Denny/esb-example/helloworld.zip
workspace/Denny/esb-example/helloworld_testclient.zip
Log:
esb helloworld sample
Added: workspace/Denny/esb-example/helloworld.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/helloworld.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/Denny/esb-example/helloworld_testclient.zip
===================================================================
(Binary files differ)
Property changes on: workspace/Denny/esb-example/helloworld_testclient.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 5 months
JBoss Tools SVN: r11387 - in trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core: facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-10-31 04:13:22 -0400 (Fri, 31 Oct 2008)
New Revision: 11387
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
Log:
JBIDE-3079:Deployment does not work for the ESB project which is imported from other workspace
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2008-10-31 08:10:24 UTC (rev 11386)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2008-10-31 08:13:22 UTC (rev 11387)
@@ -12,7 +12,7 @@
public final static String ESB_CONFIG_QUEUE_SERVICE_JBM = "jbm-queue-service.xml";
public final static String ESB_CONFIG_QUEUE_SERVICE_JBMQ = "jbmq-queue-service.xml";
- public final static String DEFAULT_ESB_CONFIG_RESOURCE_FOLDER = "resources";
+ public final static String DEFAULT_ESB_CONFIG_RESOURCE_FOLDER = "esbcontent";
public final static String DEFAULT_ESB_SOURCE_FOLDER = "src";
public final static String ESB_PROJECT_NATURE = "org.jboss.tools.esb.project.ESBNature";
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java 2008-10-31 08:10:24 UTC (rev 11386)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java 2008-10-31 08:13:22 UTC (rev 11387)
@@ -29,7 +29,7 @@
return JBOSSESB_PROJECT_FACET;
}
else if(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER.equals(propertyName)){
- return "esbcontent";//ESBProjectConstant.DEFAULT_ESB_CONFIG_RESOURCE_FOLDER;
+ return ESBProjectConstant.DEFAULT_ESB_CONFIG_RESOURCE_FOLDER;
}
else if(IJBossESBFacetDataModelProperties.ESB_SOURCE_FOLDER.equals(propertyName)){
return ESBProjectConstant.DEFAULT_ESB_SOURCE_FOLDER;
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2008-10-31 08:10:24 UTC (rev 11386)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2008-10-31 08:13:22 UTC (rev 11387)
@@ -36,6 +36,9 @@
public IModuleResource[] members() throws CoreException {
IProject project = getProject();
String esbFolder = (String)project.getPersistentProperty(IJBossESBFacetDataModelProperties.QNAME_ESB_CONTENT_FOLDER);
+ if(esbFolder == null || "".equals(esbFolder)){
+ esbFolder = ESBProjectConstant.DEFAULT_ESB_CONFIG_RESOURCE_FOLDER;
+ }
IFolder configFolder = project.getFolder(esbFolder);
IJavaProject javaPrj = JavaCore.create(project);
IPath output = javaPrj.getOutputLocation();
15 years, 5 months
JBoss Tools SVN: r11386 - in branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core: facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-10-31 04:10:24 -0400 (Fri, 31 Oct 2008)
New Revision: 11386
Modified:
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java
branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
Log:
JBIDE-3079:Deployment does not work for the ESB project which is imported from other workspace
Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2008-10-31 06:08:05 UTC (rev 11385)
+++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectConstant.java 2008-10-31 08:10:24 UTC (rev 11386)
@@ -12,7 +12,7 @@
public final static String ESB_CONFIG_QUEUE_SERVICE_JBM = "jbm-queue-service.xml";
public final static String ESB_CONFIG_QUEUE_SERVICE_JBMQ = "jbmq-queue-service.xml";
- public final static String DEFAULT_ESB_CONFIG_RESOURCE_FOLDER = "resources";
+ public final static String DEFAULT_ESB_CONFIG_RESOURCE_FOLDER = "esbcontent";
public final static String DEFAULT_ESB_SOURCE_FOLDER = "src";
public final static String ESB_PROJECT_NATURE = "org.jboss.tools.esb.project.ESBNature";
Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java 2008-10-31 06:08:05 UTC (rev 11385)
+++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/facet/JBossESBFacetDataModelProvider.java 2008-10-31 08:10:24 UTC (rev 11386)
@@ -29,7 +29,7 @@
return JBOSSESB_PROJECT_FACET;
}
else if(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER.equals(propertyName)){
- return "esbcontent";//ESBProjectConstant.DEFAULT_ESB_CONFIG_RESOURCE_FOLDER;
+ return ESBProjectConstant.DEFAULT_ESB_CONFIG_RESOURCE_FOLDER;
}
else if(IJBossESBFacetDataModelProperties.ESB_SOURCE_FOLDER.equals(propertyName)){
return ESBProjectConstant.DEFAULT_ESB_SOURCE_FOLDER;
Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2008-10-31 06:08:05 UTC (rev 11385)
+++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleDelegate.java 2008-10-31 08:10:24 UTC (rev 11386)
@@ -36,6 +36,9 @@
public IModuleResource[] members() throws CoreException {
IProject project = getProject();
String esbFolder = (String)project.getPersistentProperty(IJBossESBFacetDataModelProperties.QNAME_ESB_CONTENT_FOLDER);
+ if(esbFolder == null || "".equals(esbFolder)){
+ esbFolder = ESBProjectConstant.DEFAULT_ESB_CONFIG_RESOURCE_FOLDER;
+ }
IFolder configFolder = project.getFolder(esbFolder);
IJavaProject javaPrj = JavaCore.create(project);
IPath output = javaPrj.getOutputLocation();
15 years, 5 months
JBoss Tools SVN: r11383 - in workspace/rstryker/viewRefactor/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-30 22:31:05 -0400 (Thu, 30 Oct 2008)
New Revision: 11383
Removed:
workspace/rstryker/viewRefactor/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetViewProvider.java
workspace/rstryker/viewRefactor/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/SimplePropertiesViewExtension.java
Log:
Additional files no longer in use
Deleted: workspace/rstryker/viewRefactor/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetViewProvider.java
===================================================================
--- workspace/rstryker/viewRefactor/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetViewProvider.java 2008-10-31 02:25:31 UTC (rev 11382)
+++ workspace/rstryker/viewRefactor/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetViewProvider.java 2008-10-31 02:31:05 UTC (rev 11383)
@@ -1,155 +0,0 @@
-/**
- * JBoss, a Division of Red Hat
- * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
-* This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.archives.webtools.ui;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.tools.ant.BuildException;
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.core.runtime.content.IContentTypeMatcher;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.resource.LocalResourceManager;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.archives.webtools.Messages;
-import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
-import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
-import org.jboss.ide.eclipse.as.core.util.FileUtil;
-import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
-import org.jboss.ide.eclipse.as.ui.views.server.extensions.SimplePropertiesViewExtension;
-
-/**
- *
- * @author Rob Stryker <rob.stryker(a)redhat.com>
- *
- */
-public class FilesetViewProvider extends SimplePropertiesViewExtension {
-/*
-
- private FilesetContentProvider contentProvider;
- private LabelProvider labelProvider;
- private Fileset[] filesets;
- private Object[] selection;
-
-
- }
-
-
-
-
-
-
-
-
-
- public void fillContextMenu(Shell shell, IMenuManager menu, Object[] selection) {
- this.selection = selection;
- if( selection.length == 1 && selection[0] instanceof ServerViewProvider ) {
- menu.add(createFilter);
- } else if( selection.length == 1 && selection[0] instanceof Fileset ) {
- menu.add(editFilter);
- menu.add(deleteFilter);
- } else if( allPathWrappers(selection) ) {
- editFileAction.setEnabled(canEdit(selection));
- deleteFileAction.setEnabled(canDelete(selection));
- menu.add(editFileAction);
- menu.add(deleteFileAction);
- }
- }
-
-
-
- protected boolean canEdit(File file) {
- IFile eclipseFile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(file.getAbsolutePath()));
- IFileStore fileStore= EFS.getLocalFileSystem().fromLocalFile(file);
- boolean editable = false;
- if( eclipseFile != null ) {
- IEditorInput input = new FileEditorInput(eclipseFile);
- IEditorDescriptor desc = PlatformUI.getWorkbench().
- getEditorRegistry().getDefaultEditor(file.getName());
- if( input != null && desc != null )
- editable = true;
- } else if( fileStore != null ){
- IEditorInput input = new FileStoreEditorInput(fileStore);
- IEditorDescriptor desc = PlatformUI.getWorkbench().
- getEditorRegistry().getDefaultEditor(file.getName());
- if( input != null && desc != null )
- editable = true;
- }
- return editable;
- }
-
- public ITreeContentProvider getContentProvider() {
- return contentProvider;
- }
-
- public LabelProvider getLabelProvider() {
- return labelProvider;
- }
-
- public Properties getProperties(Object selected) {
- return null;
- }
-
- public String[] getPropertyKeys(Object selected) {
- return null;
- }
-
-
-*/
-}
Deleted: workspace/rstryker/viewRefactor/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/SimplePropertiesViewExtension.java
===================================================================
--- workspace/rstryker/viewRefactor/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/SimplePropertiesViewExtension.java 2008-10-31 02:25:31 UTC (rev 11382)
+++ workspace/rstryker/viewRefactor/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/SimplePropertiesViewExtension.java 2008-10-31 02:31:05 UTC (rev 11383)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ide.eclipse.as.ui.views.server.extensions;
-
-import java.util.Properties;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.jboss.ide.eclipse.as.ui.views.server.extensions.PropertySheetFactory.ISimplePropertiesHolder;
-import org.jboss.ide.eclipse.as.ui.views.server.extensions.PropertySheetFactory.SimplePropertiesPropertySheetPage;
-
-/**
- *
- * @author Rob Stryker <rob.stryker(a)redhat.com>
- *
- */
-public abstract class SimplePropertiesViewExtension { /*
- extends JBossServerViewExtension implements ISimplePropertiesHolder {
-
- private SimplePropertiesPropertySheetPage propertiesSheet;
-
- public SimplePropertiesViewExtension() {
- }
-
-
- public abstract void fillContextMenu(Shell shell, IMenuManager menu, Object[] selection);
- public abstract ITreeContentProvider getContentProvider();
- public abstract LabelProvider getLabelProvider();
-
-
- public IPropertySheetPage getPropertySheetPage() {
- if( propertiesSheet == null ) {
- propertiesSheet = PropertySheetFactory.createSimplePropertiesSheet(this);
- }
- return propertiesSheet;
- }
-
- public abstract String[] getPropertyKeys(Object selected);
- public abstract Properties getProperties(Object selected);
-
-*/
-}
15 years, 6 months