JBoss Tools SVN: r6623 - trunk/documentation/qa.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2008-02-28 04:29:44 -0500 (Thu, 28 Feb 2008)
New Revision: 6623
Removed:
trunk/documentation/qa/resources/
Log:
Remove unused modules from qa documentation
16 years, 10 months
JBoss Tools SVN: r6622 - trunk/documentation/qa.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2008-02-28 04:29:08 -0500 (Thu, 28 Feb 2008)
New Revision: 6622
Removed:
trunk/documentation/qa/findbugs/
Log:
Remove unused modules
16 years, 10 months
JBoss Tools SVN: r6621 - in trunk/documentation/qa/docs/test-strategy/en: modules and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2008-02-28 04:26:09 -0500 (Thu, 28 Feb 2008)
New Revision: 6621
Added:
trunk/documentation/qa/docs/test-strategy/en/images/
trunk/documentation/qa/docs/test-strategy/en/modules/
trunk/documentation/qa/docs/test-strategy/en/modules/introduction.xml
trunk/documentation/qa/docs/test-strategy/en/modules/release.xml
trunk/documentation/qa/docs/test-strategy/en/modules/schedule.xml
trunk/documentation/qa/docs/test-strategy/en/modules/scope.xml
trunk/documentation/qa/docs/test-strategy/en/modules/setup-hardware.xml
trunk/documentation/qa/docs/test-strategy/en/modules/setup-prerequisites.xml
trunk/documentation/qa/docs/test-strategy/en/modules/setup-software.xml
trunk/documentation/qa/docs/test-strategy/en/modules/setup-team.xml
trunk/documentation/qa/docs/test-strategy/en/modules/setup.xml
trunk/documentation/qa/docs/test-strategy/en/modules/testing-areas.xml
trunk/documentation/qa/docs/test-strategy/en/modules/testing-methodology.xml
trunk/documentation/qa/docs/test-strategy/en/modules/testing-techniques.xml
trunk/documentation/qa/docs/test-strategy/en/modules/testing.xml
Log:
TOC for Test Strategy
Added: trunk/documentation/qa/docs/test-strategy/en/modules/introduction.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/introduction.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/introduction.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="intro">
+ <title>Introduction</title>
+ <para>TBD</para>
+</chapter>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/introduction.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/release.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/release.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/release.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="release">
+ <title>Release Management</title>
+ <para>TBD</para>
+</chapter>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/release.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/schedule.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/schedule.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/schedule.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="schedule">
+ <title>Schedule</title>
+ <para>TBD</para>
+</chapter>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/schedule.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/scope.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/scope.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/scope.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="scope">
+ <title>Scope</title>
+ <para>TBD</para>
+</chapter>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/scope.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/setup-hardware.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/setup-hardware.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/setup-hardware.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sect1 id="setup-hardware">
+ <title>Hardware</title>
+ <para>TBD</para>
+</sect1>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/setup-hardware.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/setup-prerequisites.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/setup-prerequisites.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/setup-prerequisites.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sect1 id="setup-prerequisites">
+ <title>Setup Prerequisites</title>
+ <para>TBD</para>
+</sect1>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/setup-prerequisites.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/setup-software.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/setup-software.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/setup-software.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sect1 id="setup-software">
+ <title>Software</title>
+ <para>TBD</para>
+</sect1>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/setup-software.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/setup-team.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/setup-team.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/setup-team.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sect1 id="setup-team">
+ <title>Team</title>
+ <para>TBD</para>
+</sect1>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/setup-team.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/setup.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/setup.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/setup.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="setup">
+ <title>Setup Testing</title>
+ <para>TBD</para>
+ &setup-prerequisites;
+ &setup-hardware;
+ &setup-software;
+ &setup-team;
+</chapter>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/setup.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/testing-areas.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/testing-areas.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/testing-areas.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sect1 id="testing-areas">
+ <title>Areas</title>
+ <para>TBD</para>
+· INSTALLATION:
+· GUI
+· FUNCTIONAL
+· INTEGRATION
+· PERFORMANCE
+· FAILURE RECOVERY
+</sect1>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/testing-areas.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/testing-methodology.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/testing-methodology.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/testing-methodology.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sect1 id="testing-methodology">
+ <title>Methodology</title>
+ <para>TBD</para>
+ Problem Identification
+ Defect rectification
+ Re-testing
+ Sign-off testing activities
+ Sign-off whole testing Reporting
+</sect1>
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/testing-methodology.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/testing-techniques.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/testing-techniques.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/testing-techniques.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sect1 id="testing-techniques">
+ <title>Techniques</title>
+ <para>TBD</para>
+</sect1>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/testing-techniques.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/modules/testing.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/modules/testing.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/modules/testing.xml 2008-02-28 09:26:09 UTC (rev 6621)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter id="testing">
+ <title>Testing</title>
+ <para>TBD</para>
+ &testing-areas;
+ &testing-techniques;
+ &testing-methodology;
+</chapter>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/modules/testing.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 10 months
JBoss Tools SVN: r6620 - trunk/documentation/qa/docs/test-strategy.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2008-02-28 04:24:30 -0500 (Thu, 28 Feb 2008)
New Revision: 6620
Added:
trunk/documentation/qa/docs/test-strategy/.project
trunk/documentation/qa/docs/test-strategy/pom.xml
Log:
TOC for Test Strategy
Added: trunk/documentation/qa/docs/test-strategy/.project
===================================================================
--- trunk/documentation/qa/docs/test-strategy/.project (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/.project 2008-02-28 09:24:30 UTC (rev 6620)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>test-strategy</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/documentation/qa/docs/test-strategy/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/pom.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/pom.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/pom.xml 2008-02-28 09:24:30 UTC (rev 6620)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>documentation</artifactId>
+ <groupId>org.jboss.tools</groupId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>jboss-tools-test-plan-${translation}</artifactId>
+ <packaging>jdocbook</packaging>
+ <name>JBossTools-Test-Plan-(${translation})</name>
+ <version>1.0-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.9</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
+
Property changes on: trunk/documentation/qa/docs/test-strategy/pom.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 10 months
JBoss Tools SVN: r6619 - in trunk/documentation/qa/docs/test-strategy: en and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2008-02-28 04:22:05 -0500 (Thu, 28 Feb 2008)
New Revision: 6619
Added:
trunk/documentation/qa/docs/test-strategy/en/
trunk/documentation/qa/docs/test-strategy/en/Book_Info.xml
trunk/documentation/qa/docs/test-strategy/en/master.xml
Log:
TOC for Test Strategy
Added: trunk/documentation/qa/docs/test-strategy/en/Book_Info.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/Book_Info.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/Book_Info.xml 2008-02-28 09:22:05 UTC (rev 6619)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bookinfo>
+ <title>JBoss Tools Testing Strategy</title>
+ <copyright>
+ <year>2008</year>
+ <holder>JBoss, Inc.</holder>
+ </copyright>
+</bookinfo>
\ No newline at end of file
Property changes on: trunk/documentation/qa/docs/test-strategy/en/Book_Info.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/qa/docs/test-strategy/en/master.xml
===================================================================
--- trunk/documentation/qa/docs/test-strategy/en/master.xml (rev 0)
+++ trunk/documentation/qa/docs/test-strategy/en/master.xml 2008-02-28 09:22:05 UTC (rev 6619)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
+"../../resources/support/docbook-dtd/docbookx.dtd"
+
+[
+ <!ENTITY introduction SYSTEM "modules/introduction.xml">
+ <!ENTITY scope SYSTEM "modules/scope.xml">
+ <!ENTITY testing SYSTEM "modules/testing.xml">
+ <!ENTITY testing-areas SYSTEM "modules/testing-areas.xml">
+ <!ENTITY testing-techniques SYSTEM "modules/testing-techniques.xml">
+ <!ENTITY testing-methodology SYSTEM "modules/testing-methodology.xml">
+ <!ENTITY setup SYSTEM "modules/setup.xml">
+ <!ENTITY setup-prerequisites SYSTEM "modules/setup-prerequisites.xml">
+ <!ENTITY setup-hardware SYSTEM "modules/setup-hardware.xml">
+ <!ENTITY setup-software SYSTEM "modules/setup-software.xml">
+ <!ENTITY setup-team SYSTEM "modules/setup-team.xml">
+ <!ENTITY release SYSTEM "modules/release.xml">
+ <!ENTITY schedule SYSTEM "modules/schedule.xml">
+]>
+
+<book>
+
+ <bookinfo>
+ <title>JBoss Tools Test Strategy</title>
+ <copyright>
+ <year>2007</year>
+ <holder>Red Hat</holder>
+ </copyright>
+ <releaseinfo></releaseinfo>
+ </bookinfo>
+
+
+ <toc />
+ &introduction;
+ &scope;
+ &testing;
+ &setup;
+ &release;
+ &schedule;
+
+
+</book>
Property changes on: trunk/documentation/qa/docs/test-strategy/en/master.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 10 months
JBoss Tools SVN: r6618 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.tomahawk/src/org/jboss/tools/jsf/vpe/tomahawk/template.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2008-02-28 01:43:16 -0500 (Thu, 28 Feb 2008)
New Revision: 6618
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.tomahawk/src/org/jboss/tools/jsf/vpe/tomahawk/template/DataScrollerTemplate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1818
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.tomahawk/src/org/jboss/tools/jsf/vpe/tomahawk/template/DataScrollerTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.tomahawk/src/org/jboss/tools/jsf/vpe/tomahawk/template/DataScrollerTemplate.java 2008-02-28 04:38:43 UTC (rev 6617)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.tomahawk/src/org/jboss/tools/jsf/vpe/tomahawk/template/DataScrollerTemplate.java 2008-02-28 06:43:16 UTC (rev 6618)
@@ -158,14 +158,14 @@
}
/* (non-Javadoc)
- * @see org.jboss.tools.vpe.editor.template.VpeTemplate#getTagDescription(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMElement, java.lang.Object)
+ * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#getTagDescription(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMElement, java.lang.Object)
*/
@Override
public VpeTagDescription getTagDescription(VpePageContext pageContext,
Element sourceElement, nsIDOMDocument visualDocument,
nsIDOMElement visualElement, Object data) {
- // TODO Auto-generated method stub
- return null;
+ return super.getTagDescription(pageContext, sourceElement, visualDocument,
+ visualElement, data);
}
/* (non-Javadoc)
16 years, 10 months
JBoss Tools SVN: r6617 - trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-27 23:38:43 -0500 (Wed, 27 Feb 2008)
New Revision: 6617
Added:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingActionTime.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingActionType.xml
Modified:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/CorrectFileset.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/CorrectPackage.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetExcludes.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetInWorkspace.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetIncludes.xml
trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFolderName.xml
Log:
All unit tests that are written now pass ;)
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/CorrectFileset.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/CorrectFileset.xml 2008-02-28 04:28:51 UTC (rev 6616)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/CorrectFileset.xml 2008-02-28 04:38:43 UTC (rev 6617)
@@ -2,7 +2,7 @@
<packages>
<package name="TestProject.jar" type="jar" todir="/some/external/path" exploded="false" inWorkspace="false" id="someId">
- <fileset dir="/some/global/path" includes="**/*.xml" inWorkspace="false" excludes="" flattened="false">
+ <fileset dir="/some/global/path" includes="**/*.xml" inWorkspace="false" excludes="" flatten="false">
<properties></properties>
</fileset>
</package>
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/CorrectPackage.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/CorrectPackage.xml 2008-02-28 04:28:51 UTC (rev 6616)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/CorrectPackage.xml 2008-02-28 04:38:43 UTC (rev 6617)
@@ -4,8 +4,5 @@
<packages>
<package name="TestProject.jar" type="jar" todir="/some/external/path" exploded="false" inWorkspace="false" id="someId">
- <folder>
- <properties></properties>
- </folder>
</package>
</packages>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingActionTime.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingActionTime.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingActionTime.xml 2008-02-28 04:38:43 UTC (rev 6617)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<packages>
+ <package name="TestProject.jar" type="jar" todir="/some/external/path" exploded="false" inWorkspace="false" id="someId">
+ <buildAction type="ant">
+ <properties>
+ <property name="name" value="value"/>
+ </properties>
+ </buildAction>
+ </package>
+</packages>
\ No newline at end of file
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingActionType.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingActionType.xml (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingActionType.xml 2008-02-28 04:38:43 UTC (rev 6617)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<packages>
+ <package name="TestProject.jar" type="jar" todir="/some/external/path" exploded="false" inWorkspace="false" id="someId">
+ <buildAction time="preBuild">
+ <properties>
+ <property name="name" value="value"/>
+ </properties>
+ </buildAction>
+ </package>
+</packages>
\ No newline at end of file
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetExcludes.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetExcludes.xml 2008-02-28 04:28:51 UTC (rev 6616)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetExcludes.xml 2008-02-28 04:38:43 UTC (rev 6617)
@@ -2,7 +2,7 @@
<packages>
<package name="TestProject.jar" type="jar" todir="/some/external/path" exploded="false" inWorkspace="false" id="someId">
- <fileset dir="/some/global/path" includes="**/*.xml" inWorkspace="false" flattened="false">
+ <fileset dir="/some/global/path" includes="**/*.xml" inWorkspace="false" flatten="false">
<properties></properties>
</fileset>
</package>
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetInWorkspace.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetInWorkspace.xml 2008-02-28 04:28:51 UTC (rev 6616)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetInWorkspace.xml 2008-02-28 04:38:43 UTC (rev 6617)
@@ -2,7 +2,7 @@
<packages>
<package name="TestProject.jar" type="jar" todir="/some/external/path" exploded="false" inWorkspace="false" id="someId">
- <fileset dir="/some/global/path" includes="**/*.xml" excludes="" flattened="false">
+ <fileset dir="/some/global/path" includes="**/*.xml" excludes="" flatten="false">
<properties></properties>
</fileset>
</package>
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetIncludes.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetIncludes.xml 2008-02-28 04:28:51 UTC (rev 6616)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFilesetIncludes.xml 2008-02-28 04:38:43 UTC (rev 6617)
@@ -2,7 +2,7 @@
<packages>
<package name="TestProject.jar" type="jar" todir="/some/external/path" exploded="false" inWorkspace="false" id="someId">
- <fileset dir="/some/global/path" inWorkspace="false" excludes="" flattened="false">
+ <fileset dir="/some/global/path" inWorkspace="false" excludes="" flatten="false">
<properties></properties>
</fileset>
</package>
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFolderName.xml
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFolderName.xml 2008-02-28 04:28:51 UTC (rev 6616)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/inputs/archiveDescriptors/validation/MissingFolderName.xml 2008-02-28 04:38:43 UTC (rev 6617)
@@ -4,5 +4,8 @@
<packages>
<package name="TestProject.jar" type="jar" todir="/some/external/path" exploded="false" inWorkspace="false" id="someId">
+ <folder>
+ <properties></properties>
+ </folder>
</package>
</packages>
\ No newline at end of file
16 years, 10 months
JBoss Tools SVN: r6616 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.core: META-INF and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-27 23:28:51 -0500 (Wed, 27 Feb 2008)
New Revision: 6616
Added:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/concurrent-1.3.4.jar
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-common-core-2.2.1.GA.jar
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-common-logging-log4j-2.0.4.GA.jar
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-common-logging-spi-2.0.4.GA.jar
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-xml-binding.jar
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/xercesImpl-2.9.1.jar
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/ArchivesUnmarshallerImpl.java
Removed:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/concurrent.jar
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-common-4.0.4.jar
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jbossxb-1.0.1.TEST.jar
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/xercesImpl.jar
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/.classpath
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/build.properties
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java
Log:
Upgraded version of jboss xb to one i actually know the version of and can trace through the source when an error arrives.
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/.classpath
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/.classpath 2008-02-28 02:08:03 UTC (rev 6615)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/.classpath 2008-02-28 04:28:51 UTC (rev 6616)
@@ -3,11 +3,13 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="src/xml"/>
<classpathentry kind="src" path="src/eclipse"/>
- <classpathentry exported="true" kind="lib" path="lib/concurrent.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/truezip-6.jar" />
- <classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jboss-common-4.0.4.jar" />
- <classpathentry exported="true" kind="lib" path="lib/jbossxb-1.0.1.TEST.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jboss-common-core-2.2.1.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jboss-common-logging-log4j-2.0.4.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jboss-common-logging-spi-2.0.4.GA.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.9.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/truezip-6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jboss-xml-binding.jar" sourcepath="/home/rob/code/xb/target/jboss-xml-binding-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2008-02-28 02:08:03 UTC (rev 6615)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2008-02-28 04:28:51 UTC (rev 6616)
@@ -14,13 +14,15 @@
org.eclipse.jdt.core,
org.eclipse.core.variables
Eclipse-LazyStart: true
-Bundle-ClassPath: lib/concurrent.jar,
+Bundle-ClassPath: archivescore.jar,
+ archivescore-eclipse.jar,
lib/truezip-6.jar,
- lib/xercesImpl.jar,
- lib/jboss-common-4.0.4.jar,
- lib/jbossxb-1.0.1.TEST.jar,
- archivescore.jar,
- archivescore-eclipse.jar
+ lib/concurrent-1.3.4.jar,
+ lib/jboss-xml-binding.jar,
+ lib/xercesImpl-2.9.1.jar,
+ lib/jboss-common-logging-log4j-2.0.4.GA.jar,
+ lib/jboss-common-logging-spi-2.0.4.GA.jar,
+ lib/jboss-common-core-2.2.1.GA.jar
Export-Package: de.schlichtherle.io;x-friends:="org.jboss.ide.eclipse.archives.test",
org.jboss.ide.eclipse.archives.core,
org.jboss.ide.eclipse.archives.core.ant,
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/build.properties
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/build.properties 2008-02-28 02:08:03 UTC (rev 6615)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/build.properties 2008-02-28 04:28:51 UTC (rev 6616)
@@ -2,13 +2,16 @@
bin.includes = META-INF/,\
plugin.xml,\
archivescore.jar,\
- lib/,\
LICENSE-truezip.txt,\
- lib/xercesImpl.jar,\
- lib/jboss-common-4.0.4.jar,\
- lib/jbossxb-1.0.1.TEST.jar,\
log4j.xml,\
- archivescore-eclipse.jar
+ archivescore-eclipse.jar,\
+ lib/jboss-xml-binding.jar,\
+ lib/truezip-6.jar,\
+ lib/concurrent-1.3.4.jar,\
+ lib/xercesImpl-2.9.1.jar,\
+ lib/jboss-common-logging-log4j-2.0.4.GA.jar,\
+ lib/jboss-common-logging-spi-2.0.4.GA.jar,\
+ lib/jboss-common-core-2.2.1.GA.jar
source.archivescore.jar = src/main/,\
src/xml/
src.includes = LICENSE-truezip.txt,\
Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/concurrent-1.3.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/concurrent-1.3.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/concurrent.jar
===================================================================
(Binary files differ)
Deleted: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-common-4.0.4.jar
===================================================================
(Binary files differ)
Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-common-core-2.2.1.GA.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-common-core-2.2.1.GA.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-common-logging-log4j-2.0.4.GA.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-common-logging-log4j-2.0.4.GA.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-common-logging-spi-2.0.4.GA.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-common-logging-spi-2.0.4.GA.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-xml-binding.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jboss-xml-binding.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/jbossxb-1.0.1.TEST.jar
===================================================================
(Binary files differ)
Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/xercesImpl-2.9.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/xercesImpl-2.9.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/lib/xercesImpl.jar
===================================================================
(Binary files differ)
Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/ArchivesUnmarshallerImpl.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/ArchivesUnmarshallerImpl.java (rev 0)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/ArchivesUnmarshallerImpl.java 2008-02-28 04:28:51 UTC (rev 6616)
@@ -0,0 +1,213 @@
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.archives.core.model.internal.xb;
+
+import java.io.InputStream;
+import java.io.Reader;
+
+import org.jboss.xb.binding.JBossXBException;
+import org.jboss.xb.binding.ObjectModelBuilder;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.metadata.unmarshalling.DocumentBinding;
+import org.jboss.xb.binding.parser.JBossXBParser;
+import org.jboss.xb.binding.parser.sax.SaxJBossXBParser;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SundayContentHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+
+/**
+ * Unmarshaller implementation.
+ * WARNING: this implementation is not thread-safe.
+ *
+ * Taken from JBoss XB. Changed to let getParser() be public.
+ *
+ * @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
+ * @version <tt>$Revision: 2365 $</tt>
+ */
+public class ArchivesUnmarshallerImpl implements Unmarshaller {
+ private ObjectModelBuilder builder = new ObjectModelBuilder();
+ private final JBossXBParser parser;
+
+ // Constructor
+
+ /**
+ * The constructor for DTD and XSD client awareness.
+ */
+ public ArchivesUnmarshallerImpl() throws JBossXBException {
+ parser = new SaxJBossXBParser();
+ }
+
+ public void setValidation(boolean validation) throws JBossXBException {
+ parser.setFeature(VALIDATION, validation);
+ /*
+ * Only set DYNAMIC_VALIDATION to false. Setting this to true if its not
+ * already requires a document to have a DOCTYPE declaring the root
+ * element
+ */
+ if (validation == false)
+ parser.setFeature(DYNAMIC_VALIDATION, false);
+ }
+
+ public void setSchemaValidation(boolean validation) throws JBossXBException {
+ parser.setFeature(SCHEMA_VALIDATION, validation);
+ }
+
+ public void setFeature(String feature, boolean value)
+ throws JBossXBException {
+ parser.setFeature(feature, value);
+ }
+
+ public void setNamespaceAware(boolean namespaces) throws JBossXBException {
+ parser.setFeature(NAMESPACES, namespaces);
+ }
+
+ public void setEntityResolver(EntityResolver entityResolver)
+ throws JBossXBException {
+ parser.setEntityResolver(entityResolver);
+ }
+
+ public void setErrorHandler(ErrorHandler errorHandler) {
+ // todo reader.setErrorHandler(errorHandler);
+ }
+
+ public void mapFactoryToNamespace(ObjectModelFactory factory,
+ String namespaceUri) {
+ if (builder == null) {
+ builder = new ObjectModelBuilder();
+ }
+ builder.mapFactoryToNamespace(factory, namespaceUri);
+ }
+
+ public Object unmarshal(String xmlFile) throws JBossXBException {
+ // todo
+ throw new UnsupportedOperationException();
+ }
+
+ public Object unmarshal(String xmlFile, JBossXBParser.ContentHandler handler)
+ throws JBossXBException {
+ parser.parse(xmlFile, handler);
+ return handler.getRoot();
+ }
+
+ public Object unmarshal(String xml, SchemaBinding schemaBinding)
+ throws JBossXBException {
+ JBossXBParser.ContentHandler cHandler = new SundayContentHandler(
+ schemaBinding);
+ parser.parse(xml, cHandler);
+ return cHandler.getRoot();
+ }
+
+ public Object unmarshal(Reader xmlReader, SchemaBinding schemaBinding)
+ throws JBossXBException {
+ JBossXBParser.ContentHandler cHandler = new SundayContentHandler(
+ schemaBinding);
+ parser.parse(xmlReader, cHandler);
+ return cHandler.getRoot();
+ }
+
+ public Object unmarshal(InputStream xmlStream, SchemaBinding schemaBinding)
+ throws JBossXBException {
+ JBossXBParser.ContentHandler cHandler = new SundayContentHandler(
+ schemaBinding);
+ parser.parse(xmlStream, cHandler);
+ return cHandler.getRoot();
+ }
+
+ public Object unmarshal(String xml, SchemaBindingResolver schemaResolver)
+ throws JBossXBException {
+ JBossXBParser.ContentHandler cHandler = new SundayContentHandler(
+ schemaResolver);
+ parser.parse(xml, cHandler);
+ return cHandler.getRoot();
+ }
+
+ public Object unmarshal(Reader xmlReader,
+ SchemaBindingResolver schemaResolver) throws JBossXBException {
+ JBossXBParser.ContentHandler cHandler = new SundayContentHandler(
+ schemaResolver);
+ parser.parse(xmlReader, cHandler);
+ return cHandler.getRoot();
+ }
+
+ public Object unmarshal(InputStream xmlStream,
+ SchemaBindingResolver schemaResolver) throws JBossXBException {
+ JBossXBParser.ContentHandler cHandler = new SundayContentHandler(
+ schemaResolver);
+ parser.parse(xmlStream, cHandler);
+ return cHandler.getRoot();
+ }
+
+ public Object unmarshal(Reader reader, ObjectModelFactory factory,
+ Object root) throws JBossXBException {
+ if (builder == null) {
+ builder = new ObjectModelBuilder();
+ }
+ builder.init(factory, root);
+ parser.parse(reader, builder);
+ return builder.getRoot();
+ }
+
+ public Object unmarshal(InputStream is, ObjectModelFactory factory,
+ Object root) throws JBossXBException {
+ if (builder == null) {
+ builder = new ObjectModelBuilder();
+ }
+ builder.init(factory, root);
+ parser.parse(is, builder);
+ return builder.getRoot();
+ }
+
+ public Object unmarshal(String systemId, ObjectModelFactory factory,
+ Object root) throws JBossXBException {
+ if (builder == null) {
+ builder = new ObjectModelBuilder();
+ }
+ builder.init(factory, root);
+ parser.parse(systemId, builder);
+ return builder.getRoot();
+ }
+
+ public Object unmarshal(String systemId, ObjectModelFactory factory,
+ DocumentBinding binding) throws JBossXBException {
+ if (binding != null) {
+ throw new IllegalStateException(
+ "DocumentBinding API is not supported anymore!");
+ }
+ return unmarshal(systemId, factory, (Object) null);
+ }
+
+ public Object unmarshal(Reader reader, ObjectModelFactory factory,
+ DocumentBinding binding) throws JBossXBException {
+ if (binding != null) {
+ throw new IllegalStateException(
+ "DocumentBinding API is not supported anymore!");
+ }
+ return unmarshal(reader, factory, (Object) null);
+ }
+
+ public JBossXBParser getParser() {
+ return parser;
+ }
+}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java 2008-02-28 02:08:03 UTC (rev 6615)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java 2008-02-28 04:28:51 UTC (rev 6616)
@@ -22,7 +22,7 @@
package org.jboss.ide.eclipse.archives.core.model.internal.xb;
import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -41,8 +41,6 @@
import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveImpl;
import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
import org.jboss.xb.binding.XercesXsMarshaller;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
import org.jboss.xb.binding.sunday.unmarshalling.XsdBinder;
@@ -73,7 +71,7 @@
{
try {
InputStream stream = schema.openStream();
- binding = XsdBinder.bind(stream, "UTF-8", null);
+ binding = XsdBinder.bind(stream, "UTF-8", (String)null);
stream.close();
initialized = true;
} catch (IOException e) {
@@ -108,9 +106,12 @@
XbRunnable runnable = new XbRunnable() {
public void run () throws XbException {
try {
- Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+ ArchivesUnmarshallerImpl unmarshaller = new ArchivesUnmarshallerImpl();
monitor.worked(1);
binding.setStrictSchema(true);
+ unmarshaller.setValidation(true);
+ unmarshaller.getParser().setFeature("http://apache.org/xml/features/validation/schema", true);
+ unmarshaller.getParser().setProperty("http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation", schema.toExternalForm());
Object xmlObject = unmarshaller.unmarshal(in, binding);
monitor.worked(1);
16 years, 10 months
JBoss Tools SVN: r6615 - in trunk/core: plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core and 5 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-27 21:08:03 -0500 (Wed, 27 Feb 2008)
New Revision: 6615
Added:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ArchivesCoreTest.java
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/ResourceModel.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/MarshallUnmarshallTest.java
Log:
Slight API change in ArchivesCore (abstract superclass). They must now be set as the singleton instance manually rather than assuming that role upon construction.
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2008-02-27 23:18:47 UTC (rev 6614)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2008-02-28 02:08:03 UTC (rev 6615)
@@ -23,6 +23,7 @@
archivescore-eclipse.jar
Export-Package: de.schlichtherle.io;x-friends:="org.jboss.ide.eclipse.archives.test",
org.jboss.ide.eclipse.archives.core,
+ org.jboss.ide.eclipse.archives.core.ant,
org.jboss.ide.eclipse.archives.core.build,
org.jboss.ide.eclipse.archives.core.model,
org.jboss.ide.eclipse.archives.core.model.internal;x-friends:="org.jboss.ide.eclipse.archives.test",
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2008-02-27 23:18:47 UTC (rev 6614)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2008-02-28 02:08:03 UTC (rev 6615)
@@ -1,7 +1,5 @@
package org.jboss.ide.eclipse.archives.core;
-
-
import org.eclipse.core.runtime.IPath;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.build.ModelChangeListenerWithRefresh;
@@ -21,6 +19,7 @@
public WorkspaceArchivesCore ()
{
super(WORKSPACE);
+ ArchivesCore.setInstance(this);
ArchivesModel.instance().addModelListener(new ModelChangeListenerWithRefresh());
}
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2008-02-27 23:18:47 UTC (rev 6614)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCore.java 2008-02-28 02:08:03 UTC (rev 6615)
@@ -42,6 +42,11 @@
return instance;
}
+ public static void setInstance(ArchivesCore instance) {
+ ArchivesCore.instance = instance;
+ }
+
+
public static final int STANDALONE = 0;
public static final int WORKSPACE = 1;
@@ -57,8 +62,6 @@
extensionManager = createExtensionManager();
preferenceManager = createPreferenceManager();
logger = createLogger();
-
- instance = this;
}
protected abstract IRuntimeVariables createVariables();
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/ResourceModel.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/ResourceModel.java 2008-02-27 23:18:47 UTC (rev 6614)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/ResourceModel.java 2008-02-28 02:08:03 UTC (rev 6615)
@@ -17,6 +17,7 @@
model = new ResourceModel();
try {
archivesCore = new AntArchivesCore();
+ ArchivesCore.setInstance(archivesCore);
} catch( LinkageError le ) {
// ignore. the archives task will figure it out later
}
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-02-27 23:18:47 UTC (rev 6614)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2008-02-28 02:08:03 UTC (rev 6615)
@@ -1,15 +1,17 @@
package org.jboss.ide.eclipse.archives.test;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.ide.eclipse.archives.test.core.ArchivesCoreTest;
import org.jboss.ide.eclipse.archives.test.util.TruezipUtilTest;
import org.jboss.ide.eclipse.archives.test.xb.MarshallUnmarshallTest;
import org.jboss.ide.eclipse.archives.test.xb.ValidationTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
public class ArchivesTestSuite extends TestSuite {
public static Test suite() {
TestSuite suite = new TestSuite("Archives Tests");
+ suite.addTestSuite(ArchivesCoreTest.class);
suite.addTestSuite(MarshallUnmarshallTest.class);
suite.addTestSuite(ValidationTest.class);
suite.addTestSuite(TruezipUtilTest.class);
Added: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ArchivesCoreTest.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ArchivesCoreTest.java (rev 0)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ArchivesCoreTest.java 2008-02-28 02:08:03 UTC (rev 6615)
@@ -0,0 +1,52 @@
+/**
+ * JBoss, a Division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+* This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ide.eclipse.archives.test.core;
+
+import junit.framework.TestCase;
+
+import org.jboss.ide.eclipse.archives.core.ArchivesCore;
+import org.jboss.ide.eclipse.archives.core.WorkspaceArchivesCore;
+import org.jboss.ide.eclipse.archives.core.ant.AntArchivesCore;
+
+/**
+ * This class is just going to test that upon startup
+ * of the test suite, a WorkspaceArchivesCore is in place.
+ *
+ * It will also test to make sure that if we create a new
+ * ArchivesCore, it can be set as the default so that we can
+ * properly test the ant implementation.
+ *
+ * @author rob.stryker <rob.stryker(a)redhat.com>
+ *
+ */
+public class ArchivesCoreTest extends TestCase {
+ public void testArchivesCore() {
+ ArchivesCore core = ArchivesCore.getInstance();
+ assertEquals(ArchivesCore.WORKSPACE, core.getRunType());
+ assertEquals(WorkspaceArchivesCore.class, core.getClass());
+
+ AntArchivesCore core2 = new AntArchivesCore();
+ ArchivesCore.setInstance(core2);
+
+ assertEquals(ArchivesCore.STANDALONE, ArchivesCore.getInstance().getRunType());
+ }
+}
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/MarshallUnmarshallTest.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/MarshallUnmarshallTest.java 2008-02-27 23:18:47 UTC (rev 6614)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/MarshallUnmarshallTest.java 2008-02-28 02:08:03 UTC (rev 6615)
@@ -18,6 +18,7 @@
import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbFolder;
import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackage;
import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackages;
+import org.jboss.ide.eclipse.archives.core.model.internal.xb.XMLBinding.XbException;
import org.jboss.ide.eclipse.archives.test.ArchivesTest;
import org.jboss.ide.eclipse.archives.test.util.FileIOUtil;
import org.osgi.framework.Bundle;
@@ -119,8 +120,10 @@
XbPackages packsFromFile = XMLBinding.unmarshal(new FileInputStream(tmpFolder.append("marshallTest.xml").toFile()), new NullProgressMonitor());
assertDescriptor1Accurate(packsFromFile);
- } catch(Exception e) {
+ } catch(XbException e) {
fail(e.getMessage());
+ } catch( IOException ioe ) {
+ fail(ioe.getMessage());
}
}
16 years, 10 months
JBoss Tools SVN: r6614 - trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-02-27 18:18:47 -0500 (Wed, 27 Feb 2008)
New Revision: 6614
Modified:
trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/ValidationTest.java
Log:
renamed some methods to better reflect what's optional and whats required.
Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/ValidationTest.java
===================================================================
--- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/ValidationTest.java 2008-02-27 23:17:16 UTC (rev 6613)
+++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/xb/ValidationTest.java 2008-02-27 23:18:47 UTC (rev 6614)
@@ -93,23 +93,23 @@
parse("MissingPackageDir.xml", false, failedMissingRequiredAtt("todir"));
}
- public void testPackageMissingType() {
+ public void testPackageMissingOptionalType() {
parse("MissingPackageType.xml", true, failedFalsePositiveRequiredAtt("type"));
}
- public void testPackageMissingExploded() {
+ public void testPackageMissingOptionalExploded() {
XbPackages packs = parse("MissingPackageExploded.xml", true, failedFalsePositiveRequiredAtt("exploded"));
XbPackage pack = (XbPackage)packs.getAllChildren().get(0);
assertFalse(pack.isExploded());
}
- public void testPackageMissingInWorkspace() {
+ public void testPackageMissingOptionalInWorkspace() {
XbPackages packs = parse("MissingPackageInWorkspace.xml", true, failedFalsePositiveRequiredAtt("inWorkspace"));
XbPackage pack = (XbPackage)packs.getAllChildren().get(0);
assertTrue(pack.isInWorkspace());
}
- public void testPackageMissingId() {
+ public void testPackageMissingOptionalId() {
XbPackages packs = parse("MissingPackageID.xml", true, failedMissingRequiredAtt("id"));
XbPackage pack = (XbPackage)packs.getAllChildren().get(0);
assertNull(pack.getId());
@@ -148,12 +148,12 @@
parse("MissingFilesetIncludes.xml", false, failedMissingRequiredAtt("includes"));
}
- public void testFilesetMissingExcludes() {
- XbPackages packs = parse("MissingFilesetExcludes.xml", true, failedFalsePositiveRequiredAtt("excludes"));
+ public void testFilesetMissingOptionalExcludes() {
+ parse("MissingFilesetExcludes.xml", true, failedFalsePositiveRequiredAtt("excludes"));
// no default
}
- public void testFilesetMissingInWorkspace() {
+ public void testFilesetMissingOptionalInWorkspace() {
XbPackages packs = parse("MissingFilesetInWorkspace.xml", true, failedFalsePositiveRequiredAtt("inWorkspace"));
// no default
XbPackage pack = (XbPackage)packs.getAllChildren().get(0);
@@ -164,7 +164,7 @@
assertTrue(fs.isInWorkspace());
}
- public void testFilesetMissingFlattened() {
+ public void testFilesetMissingOptionalFlattened() {
XbPackages packs = parse("MissingFilesetFlattened.xml", true, failedFalsePositiveRequiredAtt("flattened"));
// no default
XbPackage pack = (XbPackage)packs.getAllChildren().get(0);
16 years, 10 months