JBoss Tools SVN: r17530 - trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2009-09-11 13:08:58 -0400 (Fri, 11 Sep 2009)
New Revision: 17530
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF
Log:
jsv.verification plug-in activation error is fixed
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF 2009-09-11 16:53:55 UTC (rev 17529)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.verification/META-INF/MANIFEST.MF 2009-09-11 17:08:58 UTC (rev 17530)
@@ -1,17 +1,13 @@
Manifest-Version: 1.0
Bundle-Name: %Bundle-Name.0
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActiva
- tor
Bundle-ManifestVersion: 2
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.jboss.tools.jsf.verification;singleton:=true
Bundle-Localization: plugin
-Provide-Package: org.jboss.tools.jsf.verification.vrules,
- org.jboss.tools.jsf.verification.vrules.toview
Require-Bundle: org.jboss.tools.common.verification,
org.jboss.tools.jsf
Bundle-Version: 2.0.0
-Eclipse-LazyStart: true
Export-Package: org.jboss.tools.jsf.verification.vrules,
org.jboss.tools.jsf.verification.vrules.toview
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
16 years, 7 months
JBoss Tools SVN: r17529 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml: resources/meta and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-09-11 12:53:55 -0400 (Fri, 11 Sep 2009)
New Revision: 17529
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeletePropertyHandler.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/ComplexAttrUtil.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigComplexPropertyImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigSimplePropertyImpl.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/plugin.xml
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibconfig3.meta
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibConfigLoader.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2607
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/plugin.xml
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/plugin.xml 2009-09-11 16:50:49 UTC (rev 17528)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/plugin.xml 2009-09-11 16:53:55 UTC (rev 17529)
@@ -91,9 +91,16 @@
class="org.jboss.tools.hibernate.xml.model.impl.OrderedObject2Impl"/>
<xclass id="org.jboss.tools.hibernate.xml.model.impl.RegularObject2Impl"
class="org.jboss.tools.hibernate.xml.model.impl.RegularObject2Impl"/>
+ <xclass id="org.jboss.tools.hibernate.xml.model.impl.HibConfigComplexPropertyImpl"
+ class="org.jboss.tools.hibernate.xml.model.impl.HibConfigComplexPropertyImpl"/>
+ <xclass id="org.jboss.tools.hibernate.xml.model.impl.HibConfigSimplePropertyImpl"
+ class="org.jboss.tools.hibernate.xml.model.impl.HibConfigSimplePropertyImpl"/>
<xclass id="org.jboss.tools.hibernate.xml.model.impl.ContextPackageProvider"
class="org.jboss.tools.hibernate.xml.model.impl.ContextPackageProvider"/>
+
+ <xclass id="org.jboss.tools.hibernate.xml.model.handlers.DeletePropertyHandler"
+ class="org.jboss.tools.hibernate.xml.model.handlers.DeletePropertyHandler"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibconfig3.meta
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibconfig3.meta 2009-09-11 16:50:49 UTC (rev 17528)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/resources/meta/hibconfig3.meta 2009-09-11 16:53:55 UTC (rev 17529)
@@ -3,7 +3,11 @@
"meta.dtd">
<XModelEntityGroup>
<VERSION DEPENDS="Model:1.0" MODULE="Hibernate" VERSION="1.0"/>
- <MAPPINGS/>
+ <MAPPINGS>
+ <MAPPING name="Implementations">
+ <PAIR name="ComplexProperty" value="org.jboss.tools.hibernate.xml.model.impl.HibConfigComplexPropertyImpl"/>
+ </MAPPING>
+ </MAPPINGS>
<ICONS>
<GROUP name="action"/>
<GROUP name="main">
@@ -658,7 +662,9 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
- <XModelEntity ImplementingClass="org.jboss.tools.hibernate.xml.model.impl.HibConfigListenerImpl" XMLSUBPATH="listener" name="HibConfig3Listener">
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.hibernate.xml.model.impl.HibConfigListenerImpl"
+ XMLSUBPATH="listener" name="HibConfig3Listener">
<XChildrenEntities/>
<XEntityRenderer>
<ICONS>
@@ -850,6 +856,9 @@
<EntityData EntityName="HibConfig3Mapping">
<AttributeData AttributeName="class" Mandatory="no"/>
<AttributeData AttributeName="package" Mandatory="no"/>
+ <AttributeData AttributeName="file" Mandatory="no"/>
+ <AttributeData AttributeName="jar" Mandatory="no"/>
+ <AttributeData AttributeName="resource" Mandatory="no"/>
</EntityData>
</XActionItem>
</XActionItem>
@@ -864,9 +873,388 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
+ <XModelEntity ImplementingClass="%ComplexProperty%" name="HibConfig3ObjectBytecode">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.hibernate.folder" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="Bytecode" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general"
+ default="Bytecode" name="name" visibility="false" xmlname="name">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.bytecode.provider" name="provider"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.bytecode.use_reflection_optimizer" name="use reflection optimizer">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"/>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ComplexProperty%" name="HibConfig3ObjectC3P0">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.hibernate.folder" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="C3P0" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general" default="C3P0"
+ name="name" visibility="false" xmlname="name">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.c3p0.acquire_increment" name="acquire increment"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.c3p0.idle_test_period" name="idle test period"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.c3p0.max_size" name="max size"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.c3p0.max_statements" name="max statements"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.c3p0.min_size" name="min size"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.c3p0.timeout" name="timeout"/>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"/>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ComplexProperty%" name="HibConfig3ObjectCache">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.hibernate.folder" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="Cache" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general"
+ default="Cache" name="name" visibility="false" xmlname="name">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.cache.jndi" name="jndi"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.cache.provider_class" name="provider class">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.cache.provider_configuration_file_resource_path" name="provider configuration file">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.cache.query_cache_factory" name="query cache factory">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.cache.region_prefix" name="region prefix">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.cache.use_minimal_puts" name="use minimal puts">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.cache.use_query_cache" name="use query cache">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.cache.use_second_level_cache" name="use second level cache">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.cache.use_structured_entries" name="use structured entries">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"/>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ComplexProperty%" name="HibConfig3ObjectConnection">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.hibernate.folder" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="Connection" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general"
+ default="Connection" name="name" visibility="false" xmlname="name">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.connection" name="connection"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.connection.autocommit" name="autocommit">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.connection.datasource" name="datasource"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.connection.driver_class" name="driver class">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.connection.isolation" name="isolation"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.connection.password" name="password"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.connection.pool_size" name="pool size"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.connection.provider_class" name="provider class">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.connection.release_mode" name="release mode">
+ <Constraint loader="List">
+ <value/>
+ <value name="on_close"/>
+ <value name="after_transaction"/>
+ <value name="after_statement"/>
+ <value name="auto"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.connection.url" name="url"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.connection.username" name="username"/>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"/>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ComplexProperty%" name="HibConfig3ObjectJDBC">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.hibernate.folder" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="JDBC" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general" default="JDBC"
+ name="name" visibility="false" xmlname="name">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jdbc.batch_size" name="batch size"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jdbc.batch_versioned_data" name="batch versioned data"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jdbc.factory_class" name="factory class"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jdbc.fetch_size" name="fetch size"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jdbc.sql_exception_converter" name="sql exception converter"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jdbc.use_get_generated_keys" name="use get generated keys">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jdbc.use_scrollable_resultset" name="use scrollable resultset">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jdbc.use_streams_for_binary" name="use streams for binary">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jdbc.wrap_result_sets" name="wrap result sets">
+ <Constraint loader="List">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"/>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ComplexProperty%" name="HibConfig3ObjectJNDI">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.hibernate.folder" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="JNDI" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general" default="JNDI"
+ name="name" visibility="false" xmlname="name">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jndi" name="jndi"/>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jndi.class" name="class">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute
+ PROPERTIES="category=general;h_property=hibernate.jndi.url" name="url"/>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"/>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
<XModelEntity ImplementingClass="%Hibernate3OrderedFolder%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.hibernate.ui.xml.form.Hibernate3FormLayoutData" name="HibConfig3PropertiesFolder">
<XChildrenEntities>
+ <XChildEntity maxCount="1" name="HibConfig3ObjectBytecode" required="yes"/>
+ <XChildEntity maxCount="1" name="HibConfig3ObjectC3P0" required="yes"/>
+ <XChildEntity maxCount="1" name="HibConfig3ObjectCache" required="yes"/>
+ <XChildEntity maxCount="1" name="HibConfig3ObjectConnection" required="yes"/>
+ <XChildEntity maxCount="1" name="HibConfig3ObjectJDBC" required="yes"/>
+ <XChildEntity maxCount="1" name="HibConfig3ObjectJNDI" required="yes"/>
<XChildEntity name="HibConfig3Property"/>
</XChildrenEntities>
<XEntityRenderer>
@@ -905,7 +1293,9 @@
</XActionItem>
<XDependencies/>
</XModelEntity>
- <XModelEntity ImplementingClass="%Regular2%" XMLSUBPATH="property" name="HibConfig3Property">
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.hibernate.xml.model.impl.HibConfigSimplePropertyImpl"
+ XMLSUBPATH="property" name="HibConfig3Property">
<XChildrenEntities/>
<XEntityRenderer>
<ICONS>
@@ -935,7 +1325,8 @@
displayName="Properties..." kind="action" name="Properties"/>
</XActionItem>
<XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
- <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ <XActionItem BaseActionName="Delete"
+ HandlerClassName="org.jboss.tools.hibernate.xml.model.handlers.DeletePropertyHandler"
ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
</XActionItem>
<XActionItem displayName="move" kind="list" name="MoveActions">
@@ -1081,7 +1472,7 @@
<XActionItem displayName="New" group="1" kind="list" name="CreateActions">
<XActionItem displayName="File" group="1" kind="list" name="CreateFiles">
<XActionItem kind="list" name="ORM">
- <XActionItem HandlerClassName="%SpecialWizard%" HIDE="always"
+ <XActionItem HIDE="always" HandlerClassName="%SpecialWizard%"
ICON="main.hibernate.file"
PROPERTIES="entity=FileHibConfig3;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml"
displayName="Hibernate Configuration 3.0..." kind="action" name="CreateFileHibConfig3">
@@ -1109,7 +1500,7 @@
<XActionItem displayName="New" group="1" kind="list" name="CreateActions">
<XActionItem displayName="File" group="1" kind="list" name="CreateFiles">
<XActionItem kind="list" name="ORM">
- <XActionItem HandlerClassName="%SpecialWizard%" HIDE="always"
+ <XActionItem HIDE="always" HandlerClassName="%SpecialWizard%"
ICON="main.hibernate.file"
PROPERTIES="entity=FileHibConfig3;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml"
displayName="Hibernate Configuration 3.0..." kind="action" name="CreateFileHibConfig3">
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibConfigLoader.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibConfigLoader.java 2009-09-11 16:50:49 UTC (rev 17528)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/HibConfigLoader.java 2009-09-11 16:53:55 UTC (rev 17529)
@@ -11,10 +11,14 @@
package org.jboss.tools.hibernate.xml.model;
import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.XChild;
import org.jboss.tools.common.meta.XModelEntity;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader;
+import org.jboss.tools.common.model.project.ext.store.XMLStoreConstants;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.jboss.tools.hibernate.xml.model.impl.ComplexAttrUtil;
+import org.jboss.tools.hibernate.xml.model.impl.HibConfigComplexPropertyImpl;
import org.w3c.dom.Element;
public class HibConfigLoader extends SimpleWebFileLoader {
@@ -53,7 +57,12 @@
protected void loadFolders(Element element, XModelObject o, String[] folders) {
for (int i = 0; i < folders.length; i++) {
XModelObject c = o.getChildByPath(folders[i]);
- if(c != null) super.loadChildren(element, c);
+ if(c != null) {
+ super.loadChildren(element, c);
+ if(i == 0) {
+ assignComplexProperties(c);
+ }
+ }
}
}
@@ -81,5 +90,21 @@
}
return super.isSaveable(entity, n, v, dv);
}
-
+
+ private void assignComplexProperties(XModelObject folder) {
+ XModelObject[] ps = folder.getChildren(HibConfigComplexPropertyImpl.ENT_PROPERTY);
+ for (int i = 0; i < ps.length; i++) {
+ String n = ps[i].getAttributeValue(XMLStoreConstants.ATTR_NAME);
+ String v = ps[i].getAttributeValue(XMLStoreConstants.ATTR_VALUE);
+ XAttribute attr = ComplexAttrUtil.findComplexAttr(folder, n);
+ if(attr != null) {
+ XModelEntity entity = attr.getModelEntity();
+ XModelObject c = folder.getChildByPath(entity.getAttribute("name").getDefaultValue());
+ if(c != null) {
+ c.setAttributeValue(attr.getName(), v);
+ }
+ }
+ }
+ }
+
}
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeletePropertyHandler.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeletePropertyHandler.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeletePropertyHandler.java 2009-09-11 16:53:55 UTC (rev 17529)
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.xml.model.handlers;
+
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.XModelEntity;
+import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.project.ext.store.XMLStoreConstants;
+import org.jboss.tools.hibernate.xml.model.impl.ComplexAttrUtil;
+
+public class DeletePropertyHandler extends DefaultRemoveHandler {
+
+ public DeletePropertyHandler() {}
+
+ public void executeHandler(XModelObject object, java.util.Properties p) throws XModelException {
+ String name = object.getAttributeValue(XMLStoreConstants.ATTR_NAME);
+ XAttribute attr = ComplexAttrUtil.findComplexAttr(object.getParent(), name);
+ if(attr != null) {
+ XModelEntity entity = attr.getModelEntity();
+ XModelObject c = object.getParent().getChildByPath(entity.getAttribute(XMLStoreConstants.ATTR_NAME).getDefaultValue());
+ if(c != null) {
+ c.getModel().editObjectAttribute(c, attr.getName(), "");
+ }
+ } else {
+ super.executeHandler(object, p);
+ }
+ }
+
+}
Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/handlers/DeletePropertyHandler.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/ComplexAttrUtil.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/ComplexAttrUtil.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/ComplexAttrUtil.java 2009-09-11 16:53:55 UTC (rev 17529)
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.xml.model.impl;
+
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.XChild;
+import org.jboss.tools.common.meta.XModelEntity;
+import org.jboss.tools.common.model.XModelObject;
+
+public class ComplexAttrUtil {
+
+ public static XAttribute findComplexAttr(XModelObject folder, String hProperty) {
+ XChild[] cs = folder.getModelEntity().getChildren();
+ for (int i = 0; i < cs.length; i++) {
+ if(cs[i].getMaxCount() == 1 && cs[i].isRequired()) {
+ String n = cs[i].getName();
+ XModelEntity e = folder.getModelEntity().getMetaModel().getEntity(n);
+ if(e == null) continue;
+ XAttribute[] as = e.getAttributes();
+ for (int j = 0; j < as.length; j++) {
+ if(hProperty.equals(as[j].getProperty(HibConfigComplexPropertyImpl.H_PROPERTY))) {
+ return as[j];
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+}
Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/ComplexAttrUtil.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigComplexPropertyImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigComplexPropertyImpl.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigComplexPropertyImpl.java 2009-09-11 16:53:55 UTC (rev 17529)
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.xml.model.impl;
+
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
+import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.project.ext.store.XMLStoreConstants;
+
+public class HibConfigComplexPropertyImpl extends RegularObject2Impl {
+ private static final long serialVersionUID = 1L;
+ public static String H_PROPERTY = "h_property"; //$NON-NLS-1$
+ public static String ENT_PROPERTY = "HibConfig3Property"; //$NON-NLS-1$
+ static String ATTR_VALUE = "value"; //$NON-NLS-1$
+ boolean lock = false;
+
+ public HibConfigComplexPropertyImpl() {
+ }
+
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
+ if(getParent() == null) return;
+ XAttribute a = getModelEntity().getAttribute(name);
+ if(a == null) return;
+ String propertyName = a.getProperty(H_PROPERTY);
+ if(propertyName == null || propertyName.length() == 0) return;
+ if(lock) return;
+ lock = true;
+ try {
+ XModelObject o = getParent().getChildByPath(propertyName);
+ if(o == null) {
+ if(newValue != null && newValue.length() > 0) {
+ XModelObject c = getModel().createModelObject(ENT_PROPERTY, null);
+ c.setAttributeValue(ATTR_VALUE, newValue);
+ c.setAttributeValue(XMLStoreConstants.ATTR_NAME, propertyName);
+ DefaultCreateHandler.addCreatedObject(getParent(), c, -1);
+ }
+ } else {
+ if(newValue == null || newValue.length() == 0) {
+ DefaultRemoveHandler.removeFromParent(o);
+ } else {
+ getModel().editObjectAttribute(o, ATTR_VALUE, newValue);
+ }
+ }
+ } finally {
+ lock = false;
+ }
+ }
+}
Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigComplexPropertyImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigSimplePropertyImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigSimplePropertyImpl.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigSimplePropertyImpl.java 2009-09-11 16:53:55 UTC (rev 17529)
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.xml.model.impl;
+
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.XModelEntity;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.project.ext.store.XMLStoreConstants;
+
+public class HibConfigSimplePropertyImpl extends RegularObject2Impl {
+ private static final long serialVersionUID = 1L;
+
+ public HibConfigSimplePropertyImpl() {
+ }
+
+ protected void onAttributeValueEdit(String name, String oldValue, String newValue) throws XModelException {
+ if(getParent() == null) return;
+ if(name.equals(XMLStoreConstants.ATTR_VALUE)) {
+ XAttribute attr = ComplexAttrUtil.findComplexAttr(getParent(), getAttributeValue(XMLStoreConstants.ATTR_NAME));
+ if(attr != null) {
+ XModelEntity entity = attr.getModelEntity();
+ XModelObject c = getParent().getChildByPath(entity.getAttribute(XMLStoreConstants.ATTR_NAME).getDefaultValue());
+ if(c != null) {
+ c.setAttributeValue(attr.getName(), newValue);
+ }
+ }
+ } else if(name.equals(XMLStoreConstants.ATTR_NAME)) {
+ XAttribute attr = ComplexAttrUtil.findComplexAttr(getParent(), oldValue);
+ if(attr != null) {
+ XModelEntity entity = attr.getModelEntity();
+ XModelObject c = getParent().getChildByPath(entity.getAttribute(XMLStoreConstants.ATTR_NAME).getDefaultValue());
+ if(c != null) {
+ c.setAttributeValue(attr.getName(), "");
+ }
+ }
+ attr = ComplexAttrUtil.findComplexAttr(getParent(), newValue);
+ if(attr != null) {
+ XModelEntity entity = attr.getModelEntity();
+ XModelObject c = getParent().getChildByPath(entity.getAttribute(XMLStoreConstants.ATTR_NAME).getDefaultValue());
+ if(c != null) {
+ c.setAttributeValue(attr.getName(), newValue);
+ }
+ }
+ }
+ }
+}
Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/src/org/jboss/tools/hibernate/xml/model/impl/HibConfigSimplePropertyImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 7 months
JBoss Tools SVN: r17528 - tags.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2009-09-11 12:50:49 -0400 (Fri, 11 Sep 2009)
New Revision: 17528
Added:
tags/jbosstools-3.1.0.M3/
Log:
tag as 3.1.0.M3
Copied: tags/jbosstools-3.1.0.M3 (from rev 17527, branches/jbosstools-3.1.0.M3)
16 years, 7 months
JBoss Tools SVN: r17527 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui: src/org/jboss/tools/hibernate/ui/diagram and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: vyemialyanchyk
Date: 2009-09-11 12:04:04 -0400 (Fri, 11 Sep 2009)
New Revision: 17527
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4715 - possible to sort items alphabetically
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF 2009-09-11 15:03:19 UTC (rev 17526)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF 2009-09-11 16:04:04 UTC (rev 17527)
@@ -16,6 +16,7 @@
org.eclipse.core.resources,
org.hibernate.eclipse,
org.eclipse.jdt.core,
+ org.eclipse.jdt.ui,
org.hibernate.eclipse.console
Bundle-Version: 2.0.0
Export-Package: org.jboss.tools.hibernate.ui.diagram,
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.java 2009-09-11 15:03:19 UTC (rev 17526)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.java 2009-09-11 16:04:04 UTC (rev 17527)
@@ -50,4 +50,7 @@
public static String MoveGuideCommand_Label;
public static String DiagramContentOutlinePage_Outline;
public static String DiagramContentOutlinePage_Overview;
+ public static String DiagramViewer_OutlinePage_Sort_label;
+ public static String DiagramViewer_OutlinePage_Sort_tooltip;
+ public static String DiagramViewer_OutlinePage_Sort_description;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties 2009-09-11 15:03:19 UTC (rev 17526)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties 2009-09-11 16:04:04 UTC (rev 17527)
@@ -26,3 +26,6 @@
MoveGuideCommand_Label=Move Guide
DiagramContentOutlinePage_Outline=Outline
DiagramContentOutlinePage_Overview=Overview
+DiagramViewer_OutlinePage_Sort_label=Sort
+DiagramViewer_OutlinePage_Sort_tooltip=Sort
+DiagramViewer_OutlinePage_Sort_description=Enable Sorting
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java 2009-09-11 15:03:19 UTC (rev 17526)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java 2009-09-11 16:04:04 UTC (rev 17527)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2007-2009 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -35,6 +35,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.widgets.Canvas;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -166,6 +167,9 @@
"org.jboss.tools.hibernate.ui.diagram.editors.popup.outline.contextmenu", //$NON-NLS-1$
provider, getSite().getSelectionProvider());
IToolBarManager tbm = getSite().getActionBars().getToolBarManager();
+
+ tbm.add(new LexicalSortingAction());
+
showOutlineAction = new Action() {
public void run() {
showPage(ID_OUTLINE);
@@ -347,4 +351,39 @@
return actionRegistry;
}
+ class LexicalSortingAction extends Action {
+
+ @SuppressWarnings("restriction")
+ public LexicalSortingAction() {
+ super();
+ setText(DiagramViewerMessages.DiagramViewer_OutlinePage_Sort_label);
+ org.eclipse.jdt.internal.ui.JavaPluginImages.setLocalImageDescriptors(this, "alphab_sort_co.gif"); //$NON-NLS-1$
+ setToolTipText(DiagramViewerMessages.DiagramViewer_OutlinePage_Sort_tooltip);
+ setDescription(DiagramViewerMessages.DiagramViewer_OutlinePage_Sort_description);
+
+ boolean checked = getOrmDiagram().isDeepIntoSort();
+ valueChanged(checked);
+ }
+
+ public void run() {
+ valueChanged(isChecked());
+ }
+
+ private void valueChanged(final boolean on) {
+ setChecked(on);
+ BusyIndicator.showWhile(outline.getDisplay(), new Runnable() {
+ public void run() {
+ if (on) {
+ getOrmDiagram().setDeepIntoSort(true);
+ getOrmDiagram().refresh();
+ setContents(getOrmDiagram());
+ } else {
+ getOrmDiagram().setDeepIntoSort(false);
+ getOrmDiagram().refresh();
+ setContents(getOrmDiagram());
+ }
+ }
+ });
+ }
+ }
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-09-11 15:03:19 UTC (rev 17526)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-09-11 16:04:04 UTC (rev 17527)
@@ -72,7 +72,8 @@
private boolean gridEnabled = false;
private double zoom = 1.0;
private float fontHeight = 8.5f;
-
+ private boolean deepIntoSort = false;
+
//
private boolean fileLoadSuccessfull = false;
@@ -86,7 +87,7 @@
entityNames = new String[1];
entityNames[0] = ioe.getEntityName();
recreateChildren();
- sortChildren(false);
+ sortChildren(deepIntoSort);
loadFromFile();
refreshDiagramElements();
setDirty(false);
@@ -107,7 +108,7 @@
entityNames[i] = ormElements[i].getEntityName();
}
recreateChildren();
- sortChildren(false);
+ sortChildren(deepIntoSort);
loadFromFile();
refreshDiagramElements();
setDirty(false);
@@ -260,7 +261,7 @@
Properties properties = new Properties();
saveInProperties(properties);
recreateChildren();
- sortChildren(false);
+ sortChildren(deepIntoSort);
// -> load just from properties
loadFromProperties(properties);
refreshDiagramElements();
@@ -346,6 +347,8 @@
gridEnabled = Boolean.valueOf(str).booleanValue();
str = properties.getProperty("zoom", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$
zoom = Double.valueOf(str).doubleValue();
+ str = properties.getProperty("deepIntoSort", "false"); //$NON-NLS-1$ //$NON-NLS-2$
+ deepIntoSort = Boolean.valueOf(str).booleanValue();
}
@Override
@@ -354,6 +357,7 @@
properties.put("snapToGeometry", "" + snapToGeometry); //$NON-NLS-1$ //$NON-NLS-2$
properties.put("gridEnabled", "" + gridEnabled); //$NON-NLS-1$ //$NON-NLS-2$
properties.put("zoom", "" + zoom); //$NON-NLS-1$ //$NON-NLS-2$
+ properties.put("deepIntoSort", "" + deepIntoSort); //$NON-NLS-1$ //$NON-NLS-2$
super.saveInProperties(properties);
}
@@ -504,4 +508,12 @@
public OrmLabelProvider getLabelProvider() {
return labelProvider;
}
+
+ public boolean isDeepIntoSort() {
+ return deepIntoSort;
+ }
+
+ public void setDeepIntoSort(boolean deepIntoSort) {
+ this.deepIntoSort = deepIntoSort;
+ }
}
16 years, 7 months
JBoss Tools SVN: r17526 - in trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css: properties and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: sdzmitrovich
Date: 2009-09-11 11:03:19 -0400 (Fri, 11 Sep 2009)
New Revision: 17526
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4850
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java 2009-09-11 00:46:47 UTC (rev 17525)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java 2009-09-11 15:03:19 UTC (rev 17526)
@@ -59,7 +59,6 @@
private void startListening() {
PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getSelectionService().addPostSelectionListener(this);
-
}
private void stopListening() {
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java 2009-09-11 00:46:47 UTC (rev 17525)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleManager.java 2009-09-11 15:03:19 UTC (rev 17526)
@@ -24,8 +24,6 @@
import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -65,8 +63,8 @@
if (styleRule != null)
container = new CSSStyleRuleContainer(styleRule);
- } else if ((selectedObject instanceof IDOMElement)
- || (selectedObject instanceof IDOMAttr)) {
+ } else if ((selectedObject instanceof Element)
+ || (selectedObject instanceof Attr)) {
Element selectedElement = null;
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2009-09-11 00:46:47 UTC (rev 17525)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2009-09-11 15:03:19 UTC (rev 17526)
@@ -11,8 +11,6 @@
package org.jboss.tools.jst.css.properties;
-import java.util.Map;
-
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.observable.ChangeEvent;
import org.eclipse.core.databinding.observable.IChangeListener;
@@ -27,7 +25,6 @@
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.jboss.tools.jst.css.common.CSSSelectionListener;
import org.jboss.tools.jst.css.common.StyleContainer;
import org.jboss.tools.jst.css.view.CSSEditorView;
import org.jboss.tools.jst.jsp.outline.cssdialog.common.StyleAttributes;
@@ -63,7 +60,7 @@
public void init(IPageSite pageSite) {
super.init(pageSite);
- CSSSelectionListener.getInstance().addSelectionListener(this);
+ // CSSSelectionListener.getInstance().addSelectionListener(this);
// FIXED FOR JBIDE-4791
pageSite.setSelectionProvider(new ISelectionProvider() {
@@ -87,7 +84,7 @@
@Override
public void dispose() {
- CSSSelectionListener.getInstance().removeSelectionListener(this);
+ // CSSSelectionListener.getInstance().removeSelectionListener(this);
super.dispose();
}
@@ -97,13 +94,7 @@
if ((this.part != part) && (selection instanceof IStructuredSelection)) {
IStructuredSelection structuredSelection = (IStructuredSelection) selection;
Object newSelectedObject = structuredSelection.getFirstElement();
- if (structuredSelection.getFirstElement() instanceof StyleContainer) {
- updateStyleAttributes(((StyleContainer) newSelectedObject)
- .getStyleAttributes());
-
- }
-
if ((selectedObject == null)
|| (!selectedObject.equals(newSelectedObject)))
super.selectionChanged(part, selection);
@@ -113,13 +104,16 @@
}
- private void updateStyleAttributes(Map<String, String> attributes) {
+ public void update() {
- ((IObservable) getStyleAttributes().getAttributeMap())
- .removeChangeListener(this);
- getStyleAttributes().setStyleProperties(attributes);
- ((IObservable) getStyleAttributes().getAttributeMap())
- .addChangeListener(this);
+ if (selectedObject instanceof StyleContainer) {
+ ((IObservable) getStyleAttributes().getAttributeMap())
+ .removeChangeListener(this);
+ getStyleAttributes().setStyleProperties(
+ ((StyleContainer) selectedObject).getStyleAttributes());
+ ((IObservable) getStyleAttributes().getAttributeMap())
+ .addChangeListener(this);
+ }
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java 2009-09-11 00:46:47 UTC (rev 17525)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSEditorView.java 2009-09-11 15:03:19 UTC (rev 17526)
@@ -13,12 +13,15 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.ui.IViewSite;
import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
import org.eclipse.ui.part.IContributedContentsView;
import org.eclipse.ui.part.IPageBookViewPage;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.PropertySheet;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
+import org.jboss.tools.jst.css.common.CSSSelectionListener;
import org.jboss.tools.jst.css.properties.CSSPropertyPage;
/**
@@ -30,8 +33,30 @@
static public String CONTRIBUTOR_ID = "org.eclipse.wst.css.core.csssource.source"; //$NON-NLS-1$
@Override
+ public void init(IViewSite site) throws PartInitException {
+
+ super.init(site);
+ getSite().getPage().removeSelectionListener(this);
+ CSSSelectionListener.getInstance().addSelectionListener(this);
+ }
+
+ @Override
+ public void dispose() {
+
+ super.dispose();
+ CSSSelectionListener.getInstance().removeSelectionListener(this);
+
+ }
+
+ @Override
public void selectionChanged(IWorkbenchPart part, ISelection sel) {
- // do nothing
+ super.selectionChanged(part, sel);
+
+ // TODO find better way to react upon changing of node i source editor.
+ // Description of problem: when node is been editing PropertySheet will
+ // not send selection event to page as selection is same;
+ if (getCurrentPage() instanceof CSSPropertyPage)
+ ((CSSPropertyPage) getCurrentPage()).update();
}
@Override
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java 2009-09-11 00:46:47 UTC (rev 17525)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/view/CSSPreview.java 2009-09-11 15:03:19 UTC (rev 17526)
@@ -49,6 +49,8 @@
private String previewContent = CSSUIMessages.CSSPreview_DefaultBrowserText;
+ private String currentStyle = new String();
+
private Map<String, String> styleAttributes = new HashMap<String, String>();
@Override
@@ -81,7 +83,6 @@
previewComposite.setLayoutData(gridData);
browser = new Browser(previewComposite, SWT.BORDER | SWT.MOZILLA);
- browser.setText(generateBrowserPage());
browser.setLayoutData(gridData);
browser.addMouseListener(new MouseAdapter() {
public void mouseDoubleClick(MouseEvent e) {
@@ -93,6 +94,8 @@
}
});
+ updateBrowser();
+
previewText = new Text(previewComposite, SWT.NONE | SWT.H_SCROLL);
previewText.setLayoutData(gridData);
previewText.setText(getPreviewContent());
@@ -100,14 +103,17 @@
public void focusLost(FocusEvent e) {
if (e.widget == previewText) {
String text = previewText.getText();
- if (text == null || text.equals(Constants.EMPTY)) {
- setPreviewContent(CSSUIMessages.CSSPreview_DefaultBrowserText);
- } else {
- setPreviewContent(text);
+ if (!getPreviewContent().equals(text)) {
+ if (text == null || text.equals(Constants.EMPTY)) {
+ setPreviewContent(CSSUIMessages.CSSPreview_DefaultBrowserText);
+ } else {
+ setPreviewContent(text);
+ }
+ updateBrowser();
}
browser.setEnabled(true);
- browser.setText(generateBrowserPage());
+
previewComposite.setMaximizedControl(browser);
}
}
@@ -132,18 +138,10 @@
* @return String html text representation
*/
public String generateBrowserPage() {
+ String html = Constants.OPEN_DIV_TAG + getCurrentStyle()
+ + "\">" + getPreviewContent() + Constants.CLOSE_DIV_TAG; //$NON-NLS-1$
- StringBuffer html = new StringBuffer(Constants.OPEN_DIV_TAG);
-
- for (Map.Entry<String, String> styleItem : styleAttributes.entrySet()) {
-
- html.append(styleItem.getKey() + Constants.COLON
- + styleItem.getValue() + Constants.SEMICOLON);
- }
-
- html.append("\">" + getPreviewContent() + Constants.CLOSE_DIV_TAG); //$NON-NLS-1$
-
- return html.toString();
+ return html;
}
public String getPreviewContent() {
@@ -167,7 +165,13 @@
styleAttributes.clear();
}
- updateBrowser();
+ String newStyle = getStyle(styleAttributes);
+ if (!newStyle.equals(currentStyle)) {
+
+ currentStyle = newStyle;
+ updateBrowser();
+ }
+
}
}
@@ -176,4 +180,20 @@
browser.setText(generateBrowserPage());
}
+ protected String getStyle(Map<String, String> styleAttributes) {
+
+ StringBuffer style = new StringBuffer();
+
+ for (Map.Entry<String, String> styleItem : styleAttributes.entrySet()) {
+
+ style.append(styleItem.getKey() + Constants.COLON
+ + styleItem.getValue() + Constants.SEMICOLON);
+ }
+
+ return style.toString();
+ }
+
+ public String getCurrentStyle() {
+ return currentStyle;
+ }
}
16 years, 7 months
JBoss Tools SVN: r17525 - trunk/seam/features/org.jboss.tools.seam.test.feature.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2009-09-10 20:46:47 -0400 (Thu, 10 Sep 2009)
New Revision: 17525
Added:
trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath
trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml
Removed:
trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath
trunk/seam/features/org.jboss.tools.seam.test.feature/.settings/
trunk/seam/features/org.jboss.tools.seam.test.feature/META-INF/
trunk/seam/features/org.jboss.tools.seam.test.feature/src/
Modified:
trunk/seam/features/org.jboss.tools.seam.test.feature/.project
trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-3892 - Increase JUnit test's coverage up to 60%
seam feature structure fixed
Deleted: trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath 2009-09-11 00:27:56 UTC (rev 17524)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath 2009-09-11 00:46:47 UTC (rev 17525)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
Added: trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath (rev 0)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath 2009-09-11 00:46:47 UTC (rev 17525)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/features/org.jboss.tools.seam.test.feature/.project
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/.project 2009-09-11 00:27:56 UTC (rev 17524)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/.project 2009-09-11 00:46:47 UTC (rev 17525)
@@ -6,23 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
+ <name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
Modified: trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties 2009-09-11 00:27:56 UTC (rev 17524)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties 2009-09-11 00:46:47 UTC (rev 17525)
@@ -1,4 +1 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
+bin.includes = feature.xml
Added: trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml (rev 0)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml 2009-09-11 00:46:47 UTC (rev 17525)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.seam.test.feature"
+ label="Seam Tests Feature"
+ version="1.0.0"
+ provider-name="JBoss by RedHat">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+ <plugin
+ id="org.jboss.tools.seam.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.seam.pages.xml.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.seam.text.ext.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam.ui.pages.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.seam.xml.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.seam.xml.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Property changes on: trunk/seam/features/org.jboss.tools.seam.test.feature/feature.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 7 months
JBoss Tools SVN: r17524 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core: src/org/jboss/ide/eclipse/as/wtp/core and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-09-10 20:27:56 -0400 (Thu, 10 Sep 2009)
New Revision: 17524
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/LimitedContainerVirtualFolder.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java
Log:
JBIDE-4320 - custom module factories and extensions BOUYA
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml 2009-09-11 00:26:00 UTC (rev 17523)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml 2009-09-11 00:27:56 UTC (rev 17524)
@@ -2,5 +2,12 @@
<?eclipse version="3.4"?>
<plugin>
<extension-point id="referenceResolver" name="referenceResolver" schema="schema/referenceResolver.exsd"/>
+ <extension
+ point="org.jboss.ide.eclipse.as.wtp.core.referenceResolver">
+ <resolver
+ class="org.jboss.ide.eclipse.as.wtp.core.vcf.OutputFolderReferenceResolver"
+ id="org.jboss.ide.eclipse.as.wtp.core.vcf.outputFolderReferenceResolver">
+ </resolver>
+ </extension>
</plugin>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleDelegate.java 2009-09-11 00:26:00 UTC (rev 17523)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleDelegate.java 2009-09-11 00:27:56 UTC (rev 17524)
@@ -1,16 +1,23 @@
package org.jboss.ide.eclipse.as.wtp.core.modules;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEDeployableFactory;
import org.eclipse.wst.common.componentcore.ArtifactEdit;
import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.web.internal.deployables.ComponentDeployable;
import org.jboss.ide.eclipse.as.wtp.core.vcf.JBTVirtualArchiveComponent;
@@ -24,7 +31,64 @@
super(project, aComponent);
}
+
/*
+ * Let's make this clean and organized
+ * @see org.eclipse.wst.web.internal.deployables.ComponentDeployable#members()
+ */
+ public IModuleResource[] members() throws CoreException {
+ members.clear();
+ IVirtualComponent vc = ComponentCore.createComponent(getProject());
+ if (vc != null) {
+ addFromRootVirtualFolder(vc);
+ addConsumableReferences(vc);
+ addUtilMembers(vc);
+ }
+
+ IModuleResource[] mr = new IModuleResource[members.size()];
+ members.toArray(mr);
+ return mr;
+ }
+
+ protected void addFromRootVirtualFolder(IVirtualComponent vc) throws CoreException {
+ IVirtualFolder vFolder = vc.getRootFolder();
+ IModuleResource[] mr = getMembers(vFolder, Path.EMPTY);
+ int size = mr.length;
+ for (int j = 0; j < size; j++) {
+ members.add(mr[j]);
+ }
+ }
+
+
+ /*
+ * This will recursively search for consumed components, and children
+ * of consumed components, and will shove them into the members area. =D
+ */
+ protected void addConsumableReferences(IVirtualComponent vc) throws CoreException {
+ List consumableMembers = new ArrayList();
+ IVirtualReference[] refComponents = vc.getReferences();
+ for (int i = 0; i < refComponents.length; i++) {
+ IVirtualReference reference = refComponents[i];
+ if (reference != null && reference.getDependencyType()==IVirtualReference.DEPENDENCY_TYPE_CONSUMES) {
+ IVirtualComponent consumedComponent = reference.getReferencedComponent();
+ if (consumedComponent!=null) {
+ if (consumedComponent.getRootFolder()!=null) {
+ IVirtualFolder vFolder = consumedComponent.getRootFolder();
+ IModuleResource[] mr = getMembers(vFolder, reference.getRuntimePath().makeRelative());
+ int size = mr.length;
+ for (int j = 0; j < size; j++) {
+ if (!members.contains(mr[j]))
+ members.add(mr[j]);
+ }
+ addUtilMembers(consumedComponent);
+ addConsumableReferences(consumedComponent);
+ }
+ }
+ }
+ }
+ }
+
+ /*
* This method is meant to be overridden by subclasses. Return whether or not to add this file
* to the members list. If it should be filtered out, or if it will be returned as a child
* module instead, return false. Otherwise return true.
@@ -45,7 +109,7 @@
}
/*
- * Should we meld the jar / external jar / var reference in with the members() IModuleResource objects.
+ * Should we meld the jar / external jar / var / reference in with the members() IModuleResource objects.
* If yes, the reference will appear like any other file.
* If no, you are expected to handle this file as a child module and expose it yourself
*/
@@ -67,8 +131,17 @@
return module;
}
+ /**
+ * This should return the module factory which we are associated with.
+ * @return
+ */
protected abstract String getFactoryId();
+ /*
+ * Get the URI for this child module relative to the parent module
+ * (non-Javadoc)
+ * @see org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule#getURI(org.eclipse.wst.server.core.IModule)
+ */
public String getURI(IModule child) {
if( component != null && child != null ) {
IVirtualReference[] components = getReferences(component);
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/LimitedContainerVirtualFolder.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/LimitedContainerVirtualFolder.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/LimitedContainerVirtualFolder.java 2009-09-11 00:27:56 UTC (rev 17524)
@@ -0,0 +1,69 @@
+package org.jboss.ide.eclipse.as.wtp.core.util;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.internal.resources.VirtualFile;
+import org.eclipse.wst.common.componentcore.internal.resources.VirtualFolder;
+import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
+
+public class LimitedContainerVirtualFolder extends VirtualFolder {
+
+ private IContainer[] containers;
+ public LimitedContainerVirtualFolder(
+ IProject aComponentProject,
+ IPath aRuntimePath,
+ IContainer[] containers) {
+ super(aComponentProject, aRuntimePath);
+ this.containers = containers;
+ }
+
+ public IContainer getUnderlyingFolder() {
+ if( containers != null && containers.length > 0
+ && containers[0] != null )
+ return containers[0];
+ return null;
+ }
+
+ public IContainer[] getUnderlyingFolders() {
+ return containers == null ? new IContainer[]{} : containers;
+ }
+
+ public IVirtualResource[] members(int memberFlags) throws CoreException {
+ List<IVirtualResource> virtualResources = new ArrayList<IVirtualResource>(); // result
+ Set allNames = new HashSet();
+
+ for( int i = 0; i < containers.length; i++ ) {
+ IResource realResource = containers[i];
+ if ((realResource != null) && (realResource.getType() == IResource.FOLDER || realResource.getType() == IResource.PROJECT)) {
+ IContainer realContainer = (IContainer) realResource;
+ IResource[] realChildResources = realContainer.members(memberFlags);
+ for (int realResourceIndex = 0; realResourceIndex < realChildResources.length; realResourceIndex++) {
+ IResource child = realChildResources[realResourceIndex];
+ String localName = child.getName();
+ if (allNames.add(localName)) {
+ IPath newRuntimePath = getRuntimePath().append(localName);
+ if (child instanceof IFile) {
+ virtualResources.add(new VirtualFile(getProject(), newRuntimePath, (IFile) child));
+ } else {
+ virtualResources.add(ComponentCore.createFolder(getProject(), newRuntimePath));
+ }
+ }
+ }
+ }
+ // An IResource.FILE would be an error condition (as this is a container)
+ }
+ return virtualResources.toArray(new IVirtualResource[virtualResources.size()]);
+ }
+
+
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java 2009-09-11 00:26:00 UTC (rev 17523)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java 2009-09-11 00:27:56 UTC (rev 17524)
@@ -210,6 +210,8 @@
* Overrides from VirtualComponent class
* These are mostly here because of the extrapolation
* of createVirtualReference into its own method.
+ *
+ * These can probably be removed in WTP 3.2
* *******************************************/
@Override
public IVirtualReference[] getAllReferences() {
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java 2009-09-11 00:27:56 UTC (rev 17524)
@@ -0,0 +1,63 @@
+package org.jboss.ide.eclipse.as.wtp.core.vcf;
+
+import org.eclipse.core.internal.resources.Workspace;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+import org.eclipse.wst.common.componentcore.internal.DependencyType;
+import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+
+public class OutputFolderReferenceResolver implements IReferenceResolver {
+ public static final String OUTPUT_FOLDER_SEGMENT = "org.jboss.ide.eclipse.as.wtp.core.vcf.outputFolder";
+ public static final String OUTPUT_FOLDER_PROTOCOL = PlatformURLModuleConnection.MODULE_PROTOCOL
+ +IPath.SEPARATOR+ OUTPUT_FOLDER_SEGMENT + IPath.SEPARATOR;
+ public OutputFolderReferenceResolver() {
+ }
+
+ public boolean canResolve(IVirtualComponent context,
+ ReferencedComponent referencedComponent) {
+ URI handle = referencedComponent.getHandle();
+ String s = handle.toString();
+ if(s.startsWith(OUTPUT_FOLDER_PROTOCOL))
+ return true;
+ return false;
+ }
+
+ public boolean canResolve(IVirtualReference reference) {
+ if( reference.getReferencedComponent() instanceof OutputFoldersVirtualComponent )
+ return true;
+ return false;
+ }
+
+ public IVirtualReference resolve(IVirtualComponent context,
+ ReferencedComponent referencedComponent) {
+ String project = referencedComponent.getHandle().segment(1);
+ IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(project);
+ IVirtualComponent comp = new OutputFoldersVirtualComponent(p, context);
+ IVirtualReference ref = ComponentCore.createReference(context, comp);
+ ref.setArchiveName(referencedComponent.getArchiveName());
+ ref.setRuntimePath(referencedComponent.getRuntimePath());
+ ref.setDependencyType(referencedComponent.getDependencyType().getValue());
+ return ref;
+ }
+
+ public ReferencedComponent resolve(IVirtualReference reference) {
+ if( reference.getReferencedComponent() instanceof OutputFoldersVirtualComponent ) {
+ IProject p = reference.getReferencedComponent().getProject();
+ ReferencedComponent rc = ComponentcorePackage.eINSTANCE.getComponentcoreFactory().createReferencedComponent();
+ rc.setArchiveName(reference.getArchiveName());
+ rc.setRuntimePath(reference.getRuntimePath());
+ rc.setHandle(URI.createURI(OUTPUT_FOLDER_PROTOCOL + p.getName()));
+ rc.setDependencyType(DependencyType.CONSUMES_LITERAL);
+ return rc;
+ }
+ return null;
+ }
+
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 2009-09-11 00:27:56 UTC (rev 17524)
@@ -0,0 +1,112 @@
+package org.jboss.ide.eclipse.as.wtp.core.vcf;
+
+import java.util.Properties;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+import org.jboss.ide.eclipse.as.wtp.core.util.LimitedContainerVirtualFolder;
+
+public class OutputFoldersVirtualComponent implements IVirtualComponent {
+
+ private IProject project;
+ private IVirtualComponent referencingComp;
+ public OutputFoldersVirtualComponent(IProject p, IVirtualComponent referencingComponent) {
+ this.project = p;
+ this.referencingComp = referencingComponent;
+ }
+
+ public void create(int updateFlags, IProgressMonitor aMonitor)
+ throws CoreException {
+ // Ignore
+ }
+
+ public boolean exists() {
+ return true;
+ }
+
+ public IVirtualComponent getComponent() {
+ return this;
+ }
+
+ public String getName() {
+ return getId();
+ }
+
+ public String getDeployedName() {
+ return getName();
+ }
+
+ protected String getId() {
+ return OutputFolderReferenceResolver.OUTPUT_FOLDER_SEGMENT + Path.SEPARATOR + project.getName();
+ }
+
+ public IProject getProject() {
+ return project;
+ }
+ public IVirtualComponent[] getReferencingComponents() {
+ return referencingComp == null ? new IVirtualComponent[]{} : new IVirtualComponent[]{referencingComp};
+ }
+
+ public IVirtualFolder getRootFolder() {
+ IContainer[] containers = J2EEProjectUtilities.getOutputContainers(project);
+ return new LimitedContainerVirtualFolder(project, new Path("/"), containers);
+ }
+
+ public Properties getMetaProperties() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public IPath[] getMetaResources() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public IVirtualReference getReference(String aComponentName) {
+ // Ignore
+ return null;
+ }
+
+ public IVirtualReference[] getReferences() {
+ // Ignore; no children
+ return new IVirtualReference[]{};
+ }
+
+ public boolean isBinary() {
+ return false;
+ }
+
+ public void setMetaProperties(Properties properties) {
+ // Ignore
+ }
+
+ public void setMetaProperty(String name, String value) {
+ // Ignore
+ }
+
+ public void setMetaResources(IPath[] theMetaResourcePaths) {
+ // Ignore
+ }
+
+ public void setReferences(IVirtualReference[] theReferences) {
+ // Ignore
+ }
+
+ public Object getAdapter(Class adapter) {
+ // Ignore
+ return null;
+ }
+
+ public void addReferences(IVirtualReference[] references) {
+ // Ignore
+ }
+
+}
16 years, 7 months
JBoss Tools SVN: r17523 - in trunk/jst/tests/org.jboss.tools.jst.web.kb.test: src/org/jboss/tools/jst/web/kb/test and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2009-09-10 20:26:00 -0400 (Thu, 10 Sep 2009)
New Revision: 17523
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.classpath
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java
Log:
Added some new tests for KB plug-in.
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.classpath 2009-09-10 23:03:27 UTC (rev 17522)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.classpath 2009-09-11 00:26:00 UTC (rev 17523)
@@ -8,10 +8,10 @@
<attribute name="owner.project.facets" value="jst.web"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.6.0_04">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="owner.project.facets" value="jst.java"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
+</classpath>
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2009-09-10 23:03:27 UTC (rev 17522)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2009-09-11 00:26:00 UTC (rev 17523)
@@ -13,6 +13,8 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
/**
* @author Alexey Kazakov
*/
@@ -20,7 +22,10 @@
public static Test suite() {
TestSuite suite = new TestSuite(JstWebKbAllTests.class.getName());
- suite.addTest(WebKbTest.suite());
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(WebKbTest.class),
+ "org.jboss.tools.jst.web.kb.test",
+ new String[]{"projects/TestKbModel"},
+ new String[]{"TestKbModel"}));
suite.addTestSuite(KbModelTest.class);
return suite;
}
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java 2009-09-10 23:03:27 UTC (rev 17522)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java 2009-09-11 00:26:00 UTC (rev 17523)
@@ -10,20 +10,47 @@
******************************************************************************/
package org.jboss.tools.jst.web.kb.test;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.eclipse.core.resources.IProject;
+import org.jboss.tools.jst.web.kb.internal.taglib.CustomTagLibAttribute;
+import org.jboss.tools.jst.web.kb.taglib.CustomTagLibManager;
+import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibrary;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
/**
* @author Alexey Kazakov
*/
public class WebKbTest extends TestCase {
- public void testKb() {
- //TODO
+ private IProject testProject;
+ private static final String[] CUSTOM_TAG_LIB_URIS = {"http://richfaces.org/a4j", "http://richfaces.org/rich", "http://java.sun.com/jsf/core", "http://java.sun.com/jsf/html", "http://java.sun.com/jsf/facelets", "http://www.w3.org/1999/xhtml/facelets", "http://jboss.com/products/seam/taglib", "http://java.sun.com/JSP/Page", "http://struts.apache.org/tags-html", "taglibs/componentExtension.xml"};
+
+ protected void setUp() throws Exception {
+ if(testProject==null) {
+ testProject = ProjectImportTestSetup.loadProject("TestKbModel");
+ JobUtils.waitForIdle();
+ JobUtils.delay(2000);
+ }
}
- public static Test suite() {
- return new TestSuite(WebKbTest.class);
+ public void testCustomTagLibs() {
+ ICustomTagLibrary[] libs = CustomTagLibManager.getInstance().getLibraries();
+ for (ICustomTagLibrary lib : libs) {
+ boolean found = false;
+ for (String uri : CUSTOM_TAG_LIB_URIS) {
+ if(uri.equals(lib.getURI())) {
+ found = true;
+ break;
+ }
+ }
+ assertTrue("Custom tag lib " + lib.getURI() + " is not loaded.", found);
+ }
}
-}
\ No newline at end of file
+
+ public void testCustomExtensions() {
+ CustomTagLibAttribute[] attributes = CustomTagLibManager.getInstance().getComponentExtensions();
+ assertNotNull("Can't load component extensions.", attributes);
+ assertFalse("Can't load component extensions.", attributes.length==0);
+ }}
\ No newline at end of file
16 years, 7 months
JBoss Tools SVN: r17522 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2009-09-10 19:03:27 -0400 (Thu, 10 Sep 2009)
New Revision: 17522
Removed:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/ZupUtilsTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3892 - Increase JUnit test's coverage up to 60%
Clean up tests
Deleted: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/ZupUtilsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/ZupUtilsTest.java 2009-09-10 22:58:05 UTC (rev 17521)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/ZupUtilsTest.java 2009-09-10 23:03:27 UTC (rev 17522)
@@ -1,20 +0,0 @@
-package org.jboss.tools.seam.core.test.project.facet;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.seam.internal.core.project.facet.ZipUtils;
-
-import junit.framework.TestCase;
-
-public class ZupUtilsTest extends TestCase {
-
- public void testGetZipFiles() throws IOException {
- File jar = FileLocator.getBundleFile(Platform.getBundle("org.eclipse.core.runtime"));
- String destinationName = System.getProperty("java.io.tmpdir");
- ZipUtils.getZipFiles(jar.getAbsolutePath(), destinationName, "");
- }
-
-}
16 years, 7 months
JBoss Tools SVN: r17521 - in trunk/seam: features/org.jboss.tools.seam.test.feature and 47 other directories.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2009-09-10 18:58:05 -0400 (Thu, 10 Sep 2009)
New Revision: 17521
Added:
trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath
trunk/seam/features/org.jboss.tools.seam.test.feature/.project
trunk/seam/features/org.jboss.tools.seam.test.feature/.settings/
trunk/seam/features/org.jboss.tools.seam.test.feature/.settings/org.eclipse.jdt.core.prefs
trunk/seam/features/org.jboss.tools.seam.test.feature/META-INF/
trunk/seam/features/org.jboss.tools.seam.test.feature/META-INF/MANIFEST.MF
trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties
trunk/seam/features/org.jboss.tools.seam.test.feature/src/
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamPluginsLoadTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/ZupUtilsTest.java
trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.classpath
trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.project
trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.settings/
trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.settings/org.eclipse.jdt.core.prefs
trunk/seam/tests/org.jboss.tools.seam.text.ext.test/META-INF/
trunk/seam/tests/org.jboss.tools.seam.text.ext.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.text.ext.test/build.properties
trunk/seam/tests/org.jboss.tools.seam.text.ext.test/src/
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.classpath
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.project
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.settings/
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.settings/org.eclipse.jdt.core.prefs
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/META-INF/
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/build.properties
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/src/
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/src/org/
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/src/org/jboss/
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/src/org/jboss/tools/
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/src/org/jboss/tools/seam/
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/src/org/jboss/tools/seam/ui/
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/src/org/jboss/tools/seam/ui/pages/
trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/src/org/jboss/tools/seam/ui/pages/test/
trunk/seam/tests/org.jboss.tools.seam.xml.test/.classpath
trunk/seam/tests/org.jboss.tools.seam.xml.test/.project
trunk/seam/tests/org.jboss.tools.seam.xml.test/.settings/
trunk/seam/tests/org.jboss.tools.seam.xml.test/.settings/org.eclipse.jdt.core.prefs
trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/
trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties
trunk/seam/tests/org.jboss.tools.seam.xml.test/src/
trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/
trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/
trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/
trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/
trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/
trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.classpath
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.project
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.settings/
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.settings/org.eclipse.jdt.core.prefs
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/META-INF/
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/build.properties
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/src/
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/src/org/
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/src/org/jboss/
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/src/org/jboss/tools/
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/src/org/jboss/tools/seam/
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/src/org/jboss/tools/seam/xml/
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/src/org/jboss/tools/seam/xml/ui/
trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/src/org/jboss/tools/seam/xml/ui/test/
Modified:
trunk/seam/features/org.jboss.tools.seam.feature/feature.xml
trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.core/build.properties
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/build.properties
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/build.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/build.properties
trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.xml/build.properties
trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml
trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3628 - Plugins should be .jar's not directories for efficiency sake
seam plugins converted to jars:
1. Resources used from resources unpacked to .plugin./o.j.t.s./${vevrsion}/templates folder
2. XML catalog references uses URI platform:/ to register xmls from jar in xml catalog
Modified: trunk/seam/features/org.jboss.tools.seam.feature/feature.xml
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2009-09-10 22:58:05 UTC (rev 17521)
@@ -229,7 +229,8 @@
id="org.jboss.tools.seam.core"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.jboss.tools.seam.ui"
@@ -242,7 +243,8 @@
id="org.jboss.tools.seam.xml"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.jboss.tools.seam.xml.ui"
@@ -262,7 +264,8 @@
id="org.jboss.tools.seam.pages.xml"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.jboss.tools.seam.ui.pages"
Added: trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath (rev 0)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/seam/features/org.jboss.tools.seam.test.feature/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/features/org.jboss.tools.seam.test.feature/.project
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/.project (rev 0)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/.project 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.seam.test.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/seam/features/org.jboss.tools.seam.test.feature/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/features/org.jboss.tools.seam.test.feature/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/.settings/org.eclipse.jdt.core.prefs 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,8 @@
+#Thu Sep 10 14:31:02 GMT-08:00 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/seam/features/org.jboss.tools.seam.test.feature/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/features/org.jboss.tools.seam.test.feature/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/META-INF/MANIFEST.MF (rev 0)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/META-INF/MANIFEST.MF 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Seam Tests Feature
+Bundle-SymbolicName: org.jboss.tools.seam.test.feature
+Bundle-Version: 1.0.0
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Property changes on: trunk/seam/features/org.jboss.tools.seam.test.feature/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties
===================================================================
--- trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties (rev 0)
+++ trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: trunk/seam/features/org.jboss.tools.seam.test.feature/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2009-09-10 22:58:05 UTC (rev 17521)
@@ -1,7 +1,6 @@
Manifest-Version: 1.0
Bundle-ActivationPolicy: lazy
Bundle-Name: %Bundle-Name.0
-Bundle-ClassPath: seam-core.jar
Bundle-Activator: org.jboss.tools.seam.core.SeamCorePlugin
Bundle-ManifestVersion: 2
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/build.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/build.properties 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/build.properties 2009-09-10 22:58:05 UTC (rev 17521)
@@ -1,7 +1,5 @@
-source.seam-core.jar = src/
bin.includes = plugin.xml,\
META-INF/,\
- seam-core.jar,\
plugin.properties,\
templates/,\
about.html,\
@@ -9,8 +7,9 @@
about.mappings,\
about.properties,\
seam_icon.png,\
- images/
-jars.compile.order = seam-core.jar
+ images/,\
+ .
+jars.compile.order = .
src.includes = templates/,\
src/,\
plugin.xml,\
@@ -23,3 +22,5 @@
about.mappings,\
about.properties
additional.bundles = org.eclipse.jem.util
+source.. = src/
+output.. = bin/
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2009-09-10 22:58:05 UTC (rev 17521)
@@ -15,16 +15,19 @@
import java.util.Set;
import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.jboss.tools.common.zip.UnzipOperation;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.jboss.tools.seam.core.project.facet.SeamVersion;
+import org.osgi.framework.Bundle;
/**
* Data model provider for Seam facet wizard page
@@ -151,9 +154,21 @@
* @throws IOException if templates folder not found
*/
public static File getTemplatesFolder() throws IOException {
- return new File(FileLocator.resolve(
- Platform.getBundle(SeamCorePlugin.PLUGIN_ID).getEntry(
- "/templates")).getPath()); //$NON-NLS-1$
+ Bundle bundle = SeamCorePlugin.getDefault().getBundle();
+ String version = bundle.getVersion().toString();
+ IPath stateLocation = Platform.getStateLocation(bundle);
+ File templatesDir = FileLocator.getBundleFile(bundle);
+ if(templatesDir.isFile()) {
+ File toCopy = new File(stateLocation.toFile(),version);
+ if(!toCopy.exists()) {
+ toCopy.mkdirs();
+ UnzipOperation unZip = new UnzipOperation(templatesDir.getAbsolutePath());
+ unZip.execute(toCopy,"templates.*");
+ }
+ templatesDir = toCopy;
+ }
+ return new File(templatesDir,"templates");
+
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/META-INF/MANIFEST.MF 2009-09-10 22:58:05 UTC (rev 17521)
@@ -1,7 +1,6 @@
Manifest-Version: 1.0
Eclipse-LazyStart: true
Bundle-Name: %pluginName
-Bundle-ClassPath: seam-pages-xml.jar
Bundle-Activator: org.jboss.tools.seam.pages.xml.SeamPagesXMLPlugin
Bundle-ManifestVersion: 2
Bundle-Vendor: %providerName
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/build.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/build.properties 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/build.properties 2009-09-10 22:58:05 UTC (rev 17521)
@@ -1,14 +1,14 @@
-source.seam-pages-xml.jar = src/,\
- resources/
+source.. = src/,\
+ resources/
bin.includes = plugin.xml,\
META-INF/,\
plugin.properties,\
about.html,\
dtds/,\
- seam-pages-xml.jar,\
+ .,\
schemas/,\
images/
-jars.compile.order = seam-pages-xml.jar
+jars.compile.order = .
src.includes = dtds/,\
src/,\
schemas/,\
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2009-09-10 22:58:05 UTC (rev 17521)
@@ -103,20 +103,16 @@
<catalogContribution id="default">
<public
publicId="-//JBoss/Seam Pages Configuration DTD 1.2//EN"
- uri="dtds/pages-1.2.dtd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.pages.xml/dtds/pages-1.2.dtd"/>
<uri
name="http://jboss.com/products/seam/pages-2.0.xsd"
- uri="schemas/pages-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.pages.xml/schemas/pages-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/pages-2.1.xsd"
- uri="schemas/pages-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.pages.xml/schemas/pages-2.1.xsd"/>
- <uri
- name="http://jboss.com/products/seam/pages-2.2.xsd"
- uri="schemas/pages-2.2.xsd"/>
-
</catalogContribution>
</extension>
@@ -144,4 +140,4 @@
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/build.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/build.properties 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/build.properties 2009-09-10 22:58:05 UTC (rev 17521)
@@ -5,7 +5,6 @@
META-INF/,\
.,\
icons/,\
- resources/,\
about.html,\
plugin.properties
src.includes = resources/,\
@@ -15,3 +14,4 @@
build.properties,\
META-INF/,\
about.html
+jars.compile.order = .
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF 2009-09-10 22:58:05 UTC (rev 17521)
@@ -1,7 +1,6 @@
Manifest-Version: 1.0
Eclipse-LazyStart: true
Bundle-Name: %pluginName
-Bundle-ClassPath: seam-ui-pages.jar
Bundle-Activator: org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin
Bundle-Vendor: %providerName
Provide-Package: org.jboss.tools.seam.ui.pages,
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/build.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/build.properties 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/build.properties 2009-09-10 22:58:05 UTC (rev 17521)
@@ -3,10 +3,9 @@
plugin.properties,\
images/,\
META-INF/,\
- about.html
-source.seam-ui-pages.jar = src/,\
- resources/
-jars.compile.order = seam-ui-pages.jar
+ about.html,\
+ .
+jars.compile.order = .
src.includes = resources/,\
src/,\
plugin.xml,\
@@ -15,3 +14,6 @@
build.properties,\
about.html,\
META-INF/
+output.. = bin/
+source.. = resources/,\
+ src/
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/META-INF/MANIFEST.MF 2009-09-10 22:58:05 UTC (rev 17521)
@@ -1,7 +1,6 @@
Manifest-Version: 1.0
Eclipse-LazyStart: true
Bundle-Name: %pluginName
-Bundle-ClassPath: seam-xml.jar
Bundle-Activator: org.jboss.tools.seam.xml.SeamXMLPlugin
Bundle-ManifestVersion: 2
Bundle-Vendor: %providerName
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/build.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/build.properties 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/build.properties 2009-09-10 22:58:05 UTC (rev 17521)
@@ -1,13 +1,11 @@
-source.seam-xml.jar = src/,\
- resources/
bin.includes = plugin.xml,\
META-INF/,\
plugin.properties,\
about.html,\
dtds/,\
- seam-xml.jar,\
- schemas/
-jars.compile.order = seam-xml.jar
+ schemas/,\
+ .
+jars.compile.order = .
src.includes = dtds/,\
src/,\
schemas/,\
@@ -17,3 +15,6 @@
build.properties,\
about.html,\
META-INF/
+output.. = bin/
+source.. = resources/,\
+ src/
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2009-09-10 22:58:05 UTC (rev 17521)
@@ -30,11 +30,6 @@
<keys path="help/keys-seam-lists.properties"/>
</extension>
- <extension
- point="org.eclipse.wst.xml.core.catalogContributions">
- <catalogContribution id="default">
- </catalogContribution>
- </extension>
<extension point="org.jboss.tools.common.model.classes">
<xclass id="org.jboss.tools.seam.xml.components.model.FileSeamComponentsImpl"
@@ -68,63 +63,63 @@
<catalogContribution id="default">
<uri
name="http://jboss.com/products/seam/components-1.2.xsd"
- uri="schemas/components-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/components-1.2.xsd"/>
<uri
name="http://jboss.com/products/seam/core-1.2.xsd"
- uri="schemas/core-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/core-1.2.xsd"/>
<uri
name="http://jboss.com/products/seam/drools-1.2.xsd"
- uri="schemas/drools-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/drools-1.2.xsd"/>
<uri
name="http://jboss.com/products/seam/framework-1.2.xsd"
- uri="schemas/framework-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/framework-1.2.xsd"/>
<uri
name="http://jboss.com/products/seam/jms-1.2.xsd"
- uri="schemas/jms-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/jms-1.2.xsd"/>
<uri
name="http://jboss.com/products/seam/mail-1.2.xsd"
- uri="schemas/mail-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/mail-1.2.xsd"/>
<uri
name="http://jboss.com/products/seam/pdf-1.2.xsd"
- uri="schemas/pdf-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pdf-1.2.xsd"/>
<uri
name="http://jboss.com/products/seam/remoting-1.2.xsd"
- uri="schemas/remoting-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/remoting-1.2.xsd"/>
<uri
name="http://jboss.com/products/seam/security-1.2.xsd"
- uri="schemas/security-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/security-1.2.xsd"/>
<uri
name="http://jboss.com/products/seam/spring-1.2.xsd"
- uri="schemas/spring-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/spring-1.2.xsd"/>
<uri
name="http://jboss.com/products/seam/theme-1.2.xsd"
- uri="schemas/theme-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/theme-1.2.xsd"/>
<uri
name="http://jboss.com/products/seam/web-1.2.xsd"
- uri="schemas/web-1.2.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/web-1.2.xsd"/>
<public
publicId="-//JBoss/Seam Component Configuration DTD 1.1//EN"
- uri="dtds/components-1.1.dtd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/dtds/components-1.1.dtd"/>
<uri
name="http://jboss.com/products/seam/async-2.0.xsd"
- uri="schemas/async-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/async-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/async-2.1.xsd"
- uri="schemas/async-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/async-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/async-2.2.xsd"
@@ -132,11 +127,11 @@
<uri
name="http://jboss.com/products/seam/bpm-2.0.xsd"
- uri="schemas/bpm-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/bpm-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/bpm-2.1.xsd"
- uri="schemas/bpm-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/bpm-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/bpm-2.2.xsd"
@@ -144,11 +139,11 @@
<uri
name="http://jboss.com/products/seam/components-2.0.xsd"
- uri="schemas/components-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/components-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/components-2.1.xsd"
- uri="schemas/components-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/components-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/components-2.2.xsd"
@@ -156,7 +151,7 @@
<uri
name="http://jboss.com/products/seam/cache-2.1.xsd"
- uri="schemas/cache-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/cache-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/cache-2.2.xsd"
@@ -164,11 +159,11 @@
<uri
name="http://jboss.com/products/seam/core-2.0.xsd"
- uri="schemas/core-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/core-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/core-2.1.xsd"
- uri="schemas/core-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/core-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/core-2.2.xsd"
@@ -176,11 +171,11 @@
<uri
name="http://jboss.com/products/seam/drools-2.0.xsd"
- uri="schemas/drools-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/drools-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/drools-2.1.xsd"
- uri="schemas/drools-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/drools-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/drools-2.2.xsd"
@@ -188,7 +183,7 @@
<uri
name="http://jboss.com/products/seam/document-2.1.xsd"
- uri="schemas/document-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/document-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/document-2.2.xsd"
@@ -196,11 +191,11 @@
<uri
name="http://jboss.com/products/seam/framework-2.0.xsd"
- uri="schemas/framework-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/framework-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/framework-2.1.xsd"
- uri="schemas/framework-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/framework-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/framework-2.2.xsd"
@@ -208,11 +203,11 @@
<uri
name="http://jboss.com/products/seam/international-2.0.xsd"
- uri="schemas/international-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/international-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/international-2.1.xsd"
- uri="schemas/international-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/international-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/international-2.2.xsd"
@@ -220,11 +215,11 @@
<uri
name="http://jboss.com/products/seam/jms-2.0.xsd"
- uri="schemas/jms-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/jms-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/jms-2.1.xsd"
- uri="schemas/jms-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/jms-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/jms-2.2.xsd"
@@ -232,11 +227,11 @@
<uri
name="http://jboss.com/products/seam/mail-2.0.xsd"
- uri="schemas/mail-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/mail-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/mail-2.1.xsd"
- uri="schemas/mail-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/mail-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/mail-2.2.xsd"
@@ -244,11 +239,11 @@
<uri
name="http://jboss.com/products/seam/navigation-2.0.xsd"
- uri="schemas/navigation-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/navigation-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/navigation-2.1.xsd"
- uri="schemas/navigation-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/navigation-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/navigation-2.2.xsd"
@@ -256,11 +251,11 @@
<uri
name="http://jboss.com/products/seam/pageflow-2.0.xsd"
- uri="schemas/pageflow-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pageflow-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/pageflow-2.1.xsd"
- uri="schemas/pageflow-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pageflow-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/pageflow-2.2.xsd"
@@ -268,15 +263,15 @@
<uri
name="http://jboss.com/products/seam/pages-2.0.xsd"
- uri="schemas/pages-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pages-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/pdf-2.0.xsd"
- uri="schemas/pdf-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pdf-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/pdf-2.1.xsd"
- uri="schemas/pdf-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pdf-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/pdf-2.2.xsd"
@@ -284,11 +279,11 @@
<uri
name="http://jboss.com/products/seam/persistence-2.0.xsd"
- uri="schemas/persistence-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/persistence-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/persistence-2.1.xsd"
- uri="schemas/persistence-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/persistence-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/persistence-2.2.xsd"
@@ -296,11 +291,11 @@
<uri
name="http://jboss.com/products/seam/remoting-2.0.xsd"
- uri="schemas/remoting-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/remoting-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/remoting-2.1.xsd"
- uri="schemas/remoting-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/remoting-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/remoting-2.2.xsd"
@@ -308,11 +303,11 @@
<uri
name="http://jboss.com/products/seam/security-2.0.xsd"
- uri="schemas/security-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/security-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/security-2.1.xsd"
- uri="schemas/security-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/security-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/security-2.2.xsd"
@@ -320,15 +315,15 @@
<uri
name="http://jboss.com/products/seam/spring-2.0.xsd"
- uri="schemas/spring-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/spring-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/spring-seam-2.0.xsd"
- uri="schemas/spring-seam-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/spring-seam-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/theme-2.0.xsd"
- uri="schemas/theme-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/theme-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/theme-2.1.xsd"
@@ -340,11 +335,11 @@
<uri
name="http://jboss.com/products/seam/transaction-2.0.xsd"
- uri="schemas/transaction-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/transaction-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/transaction-2.1.xsd"
- uri="schemas/transaction-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/transaction-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/transaction-2.2.xsd"
@@ -352,11 +347,11 @@
<uri
name="http://jboss.com/products/seam/web-2.0.xsd"
- uri="schemas/web-2.0.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/web-2.0.xsd"/>
<uri
name="http://jboss.com/products/seam/web-2.1.xsd"
- uri="schemas/web-2.1.xsd"/>
+ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/web-2.1.xsd"/>
<uri
name="http://jboss.com/products/seam/web-2.2.xsd"
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2009-09-10 22:58:05 UTC (rev 17521)
@@ -10,10 +10,6 @@
org.jboss.tools.seam.core.test.refactoring
Require-Bundle:
org.junit,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.jboss.tools.common.model,
- org.jboss.tools.common.el.core,
org.jboss.tools.seam.core,
org.jboss.tools.seam.xml,
org.jboss.tools.common.test,
@@ -21,23 +17,16 @@
org.eclipse.wst.common.project.facet.core,
org.jboss.tools.tests,
org.eclipse.ui.workbench,
- org.eclipse.wst.common.modulecore,
org.eclipse.wst.common.frameworks,
org.eclipse.jface,
- org.jboss.tools.jst.firstrun,
org.eclipse.wst.server.core,
- org.eclipse.datatools.connectivity,
org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring,
- org.eclipse.jdt.core,
- org.eclipse.ui.ide,
org.eclipse.jface,
- org.eclipse.jdt.core.manipulation,
- org.eclipse.jst.jsf.core,
- org.eclipse.wst.validation,
org.eclipse.jdt.launching,
org.eclipse.jdt.ui,
org.eclipse.jst.j2ee,
- org.eclipse.text
+ org.eclipse.text,
+ org.eclipse.jdt.core.manipulation;bundle-version="1.3.0",
+ org.jboss.tools.common.el.core;bundle-version="2.0.0"
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-09-10 22:44:21 UTC (rev 17520)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-09-10 22:58:05 UTC (rev 17521)
@@ -13,6 +13,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeListConverterTest;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeManagerTest;
@@ -21,7 +22,7 @@
*
*/
public class SeamCoreAllTests {
- public static final String PLUGIN_ID = "org.jboss.tools.common.model";
+ public static final String PLUGIN_ID = SeamCorePlugin.PLUGIN_ID;
//
public static Test suite() {
TestSuite suite = new TestSuite();
@@ -32,6 +33,7 @@
suite.addTestSuite(SeamEARTest.class);
suite.addTestSuite(SeamRuntimeListConverterTest.class);
suite.addTestSuite(SeamRuntimeManagerTest.class);
+ suite.addTestSuite(SeamPluginsLoadTest.class);
return suite;
}
}
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamPluginsLoadTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamPluginsLoadTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamPluginsLoadTest.java 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,12 @@
+package org.jboss.tools.seam.core.test;
+
+import org.jboss.tools.tests.AbstractPluginsLoadTest;
+
+import junit.framework.TestCase;
+
+public class SeamPluginsLoadTest extends AbstractPluginsLoadTest {
+
+ public void testBundlesAreLoadedForSeamFeature(){
+ testBundlesAreLoadedFor("org.jboss.tools.seam.feature");
+ }
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamPluginsLoadTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/ZupUtilsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/ZupUtilsTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/ZupUtilsTest.java 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,20 @@
+package org.jboss.tools.seam.core.test.project.facet;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.seam.internal.core.project.facet.ZipUtils;
+
+import junit.framework.TestCase;
+
+public class ZupUtilsTest extends TestCase {
+
+ public void testGetZipFiles() throws IOException {
+ File jar = FileLocator.getBundleFile(Platform.getBundle("org.eclipse.core.runtime"));
+ String destinationName = System.getProperty("java.io.tmpdir");
+ ZipUtils.getZipFiles(jar.getAbsolutePath(), destinationName, "");
+ }
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/ZupUtilsTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.classpath (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.classpath 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.project (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.project 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.seam.text.ext.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.settings/org.eclipse.jdt.core.prefs 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,8 @@
+#Thu Sep 10 14:36:00 GMT-08:00 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/seam/tests/org.jboss.tools.seam.text.ext.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.text.ext.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.text.ext.test/META-INF/MANIFEST.MF 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Seam Text Extension Test
+Bundle-SymbolicName: org.jboss.tools.seam.text.ext.test
+Bundle-Version: 1.0.0
+Bundle-Vendor: JBoss by RedHat
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Property changes on: trunk/seam/tests/org.jboss.tools.seam.text.ext.test/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.text.ext.test/build.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.text.ext.test/build.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.text.ext.test/build.properties 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: trunk/seam/tests/org.jboss.tools.seam.text.ext.test/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.classpath (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.classpath 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.project (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.project 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.seam.ui.pages.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.settings/org.eclipse.jdt.core.prefs 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,8 @@
+#Thu Sep 10 14:16:04 GMT-08:00 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/META-INF/MANIFEST.MF 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Seam Pages Editor Test
+Bundle-SymbolicName: org.jboss.tools.seam.ui.pages.test;singleton:=true
+Bundle-Version: 1.0.0
+Bundle-Vendor: JBoss by RedHat
+Require-Bundle: org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/build.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/build.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/build.properties 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.test/.classpath (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.test/.classpath 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.test/.project (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.test/.project 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.seam.xml.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.test/.settings/org.eclipse.jdt.core.prefs 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,8 @@
+#Thu Sep 10 14:17:28 GMT-08:00 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Seam XML Tests
+Bundle-SymbolicName: org.jboss.tools.seam.xml.test;singleton:=true
+Bundle-Version: 1.0.0
+Require-Bundle: org.eclipse.core.runtime
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.classpath (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.classpath 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.project (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.project 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.seam.xml.ui.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.settings/org.eclipse.jdt.core.prefs 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,8 @@
+#Thu Sep 10 14:21:59 GMT-08:00 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/META-INF/MANIFEST.MF 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: XML UI Tests
+Bundle-SymbolicName: org.jboss.tools.seam.xml.ui.test
+Bundle-Version: 1.0.0
+Require-Bundle: org.eclipse.core.runtime
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/build.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/build.properties (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/build.properties 2009-09-10 22:58:05 UTC (rev 17521)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 7 months