You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tuscany.apache.org by Raymond Feng <en...@gmail.com> on 2007/02/16 19:37:13 UTC
Re: svn commit: r508530 - in /incubator/tuscany/java/sdo: ./ tools/src/test/java/com/example/sequences/impl/ tools/src/test/java/org/apache/tuscany/sdo/test/ tools/src/test/resources/
Hi,
I'm seeing a build failure:
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Compilation failure
C:\Tuscany\java\sdo\tools\src\test\java\org\apache\tuscany\sdo\test\AllTests.jav
a:[15,54] cannot find symbol
symbol : class StaticSequenceNoEmfTestCase
location: package org.apache.tuscany.sdo.test
C:\Tuscany\java\sdo\tools\src\test\java\org\apache\tuscany\sdo\test\AllTests.jav
a:[15,54] cannot find symbol
symbol : class StaticSequenceNoEmfTestCase
location: package org.apache.tuscany.sdo.test
It seems that you forgot to check in StaticSequenceNoEmfTestCase.java.
Thanks,
Raymond
----- Original Message -----
From: <ke...@apache.org>
To: <tu...@ws.apache.org>
Sent: Friday, February 16, 2007 10:28 AM
Subject: svn commit: r508530 - in /incubator/tuscany/java/sdo: ./
tools/src/test/java/com/example/sequences/impl/
tools/src/test/java/org/apache/tuscany/sdo/test/ tools/src/test/resources/
> Author: kelvingoodson
> Date: Fri Feb 16 10:28:08 2007
> New Revision: 508530
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=508530
> Log:
> TUSCANY-1102 -- the validation introduced in EMF 2.2.2 highlit an issue
> with our generator, and some invalid test cases. This fix 1) establishes
> a dependency on EMF 2.2.2, 2) removes those tests which will be updated
> and incorporated into the fix for a new JIRA that will fix up the codegen
> issues 3) makes a manual fixup to the SequencesFactoryImpl which shows
> what the generator ought to have created and 4) Fixes up the xml test data
> files and leaves them where they are pending reuse in the new tests
>
> Removed:
>
> incubator/tuscany/java/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTestCase.java
> Modified:
> incubator/tuscany/java/sdo/pom.xml
>
> incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
>
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
>
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
>
> incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
>
> Modified: incubator/tuscany/java/sdo/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/pom.xml?view=diff&rev=508530&r1=508529&r2=508530
> ==============================================================================
> --- incubator/tuscany/java/sdo/pom.xml (original)
> +++ incubator/tuscany/java/sdo/pom.xml Fri Feb 16 10:28:08 2007
> @@ -54,10 +54,13 @@
> </snapshots>
> </repository>
> <repository>
> - <!-- temporarily replace the eclipse
> repo...id>eclipse.emf</id>
> - <url>http://download.eclipse.org/tools/emf/maven2</url -->
> - <id>osuosl.org</id>
> - <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url>
> + <!-- <id>eclipse.emf</id>
> + <url>http://download.eclipse.org/tools/emf/maven2</url> -->
> + <!-- <id>osuosl.org</id>
> +
> <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
> + <!-- temporarily using indiana state univ as eclipse site
> diesnt have 2.2.2 at the moment -->
> + <id>indiana</id>
> +
> <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
> <snapshots>
> <enabled>true</enabled>
> </snapshots>
> @@ -66,7 +69,7 @@
>
> <properties>
> <specVersion>2.1</specVersion>
> - <emfVersion>2.2.1</emfVersion>
> + <emfVersion>2.2.2</emfVersion>
> </properties>
>
> <modules>
>
> Modified:
> incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java?view=diff&rev=508530&r1=508529&r2=508530
> ==============================================================================
> ---
> incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
> (original)
> +++
> incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
> Fri Feb 16 10:28:08 2007
> @@ -346,13 +346,13 @@
> new String[]
> {
> "name", "MixedQuote",
> - "kind", "elementOnly"
> + "kind", "mixed"
> });
> addXSDMapping
> ((Property)mixedQuoteType.getProperties().get(MixedQuoteImpl.MIXED),
> new String[]
> {
> - "kind", "element",
> + "kind", "elementWildcard",
> "name", "mixed"
> });
>
> @@ -434,13 +434,13 @@
> new String[]
> {
> "name", "MixedRepeatingChoice",
> - "kind", "elementOnly"
> + "kind", "mixed"
> });
> addXSDMapping
>
> ((Property)mixedRepeatingChoiceType.getProperties().get(MixedRepeatingChoiceImpl.MIXED),
> new String[]
> {
> - "kind", "element",
> + "kind", "elementWildcard",
> "name", "mixed"
> });
>
> @@ -448,8 +448,8 @@
>
> ((Property)mixedRepeatingChoiceType.getProperties().get(MixedRepeatingChoiceImpl.GROUP),
> new String[]
> {
> - "kind", "element",
> - "name", "group"
> + "kind", "group",
> + "name", "group:1"
> });
>
> addXSDMapping
> @@ -457,7 +457,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "a"
> + "name", "a",
> + "group", "#group:1"
> });
>
> addXSDMapping
> @@ -465,7 +466,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "b"
> + "name", "b",
> + "group", "#group:1"
> });
>
> // TODO - kdk - is the order right? should kind, elementOnly be first
> @@ -480,8 +482,8 @@
>
> ((Property)repeatingChoiceType.getProperties().get(RepeatingChoiceImpl.GROUP),
> new String[]
> {
> - "kind", "element",
> - "name", "group"
> + "kind", "group",
> + "name", "group:0"
> });
>
> addXSDMapping
> @@ -489,7 +491,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "a"
> + "name", "a",
> + "group", "#group:0"
> });
>
> addXSDMapping
> @@ -497,7 +500,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "b"
> + "name", "b",
> + "group", "#group:0"
> });
>
> // TODO - kdk - is the order right? should kind, elementOnly be first
> @@ -512,8 +516,8 @@
> ((Property)twoRCsType.getProperties().get(TwoRCsImpl.GROUP),
> new String[]
> {
> - "kind", "element",
> - "name", "group"
> + "kind", "group",
> + "name", "group:0"
> });
>
> addXSDMapping
> @@ -521,7 +525,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "a"
> + "name", "a",
> + "group", "#group:0"
> });
>
> addXSDMapping
> @@ -529,7 +534,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "b"
> + "name", "b",
> + "group", "#group:0"
> });
>
> addXSDMapping
> @@ -544,8 +550,8 @@
> ((Property)twoRCsType.getProperties().get(TwoRCsImpl.GROUP1),
> new String[]
> {
> - "kind", "element",
> - "name", "group1"
> + "kind", "group",
> + "name", "group:4"
> });
>
> addXSDMapping
> @@ -553,7 +559,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "y"
> + "name", "y",
> + "group", "#group:4"
> });
>
> addXSDMapping
> @@ -561,7 +568,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "z"
> + "name", "z",
> + "group", "#group:4"
> });
>
> // TODO - kdk - is the order right? should kind, elementOnly be first
> @@ -570,13 +578,13 @@
> new String[]
> {
> "name", "TwoRCsMixed",
> - "kind", "elementOnly"
> + "kind", "mixed"
> });
> addXSDMapping
> ((Property)twoRCsMixedType.getProperties().get(TwoRCsMixedImpl.MIXED),
> new String[]
> {
> - "kind", "element",
> + "kind", "elementWildcard",
> "name", "mixed"
> });
>
> @@ -584,8 +592,8 @@
> ((Property)twoRCsMixedType.getProperties().get(TwoRCsMixedImpl.GROUP),
> new String[]
> {
> - "kind", "element",
> - "name", "group"
> + "kind", "group",
> + "name", "group:1"
> });
>
> addXSDMapping
> @@ -593,7 +601,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "a"
> + "name", "a",
> + "group", "#group:1"
> });
>
> addXSDMapping
> @@ -601,7 +610,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "b"
> + "name", "b",
> + "group", "#group:1"
> });
>
> addXSDMapping
> @@ -616,8 +626,8 @@
>
> ((Property)twoRCsMixedType.getProperties().get(TwoRCsMixedImpl.GROUP1),
> new String[]
> {
> - "kind", "element",
> - "name", "group1"
> + "kind", "group",
> + "name", "group:5"
> });
>
> addXSDMapping
> @@ -625,7 +635,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "y"
> + "name", "y",
> + "group", "#group:5"
> });
>
> addXSDMapping
> @@ -633,7 +644,8 @@
> new String[]
> {
> "kind", "element",
> - "name", "z"
> + "name", "z",
> + "group", "#group:5"
> });
>
>
>
> Modified:
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml?view=diff&rev=508530&r1=508529&r2=508530
> ==============================================================================
> ---
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
> (original)
> +++
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
> Fri Feb 16 10:28:08 2007
> @@ -17,9 +17,4 @@
> specific language governing permissions and limitations
> under the License.
> -->
> -<sequences:mrc xmlns:sequences="http://www.example.com/sequences">
> - <b>1</b>
> - <a>foo</a>
> -some mixed text <a>bar</a>
> - <b>2</b>
> -</sequences:mrc>
> +<sequences:mrc
> xmlns:sequences="http://www.example.com/sequences"><b>1</b><a>foo</a>some
> mixed text<a>bar</a><b>2</b></sequences:mrc>
>
> Modified:
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml?view=diff&rev=508530&r1=508529&r2=508530
> ==============================================================================
> ---
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> (original)
> +++
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> Fri Feb 16 10:28:08 2007
> @@ -18,17 +18,10 @@
> under the License.
> -->
> <sequences:mixedStockQuote
> xmlns:sequences="http://www.example.com/sequences">
> -
> - <symbol>fbnt</symbol>
> -
> - <companyName>FlyByNightTechnology</companyName>
> -
> + <symbol>fbnt</symbol>
> + <companyName>FlyByNightTechnology</companyName>
> some text
> - <quotes>
> - <price>2000.0</price>
> - </quotes>
> -
> + <quotes><price>2000.0</price></quotes>
> more text
> - <price>1000.0</price>
> -
> + <price>1000.0</price>
> </sequences:mixedStockQuote>
>
> Modified:
> incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml?view=diff&rev=508530&r1=508529&r2=508530
> ==============================================================================
> ---
> incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
> (original)
> +++
> incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
> Fri Feb 16 10:28:08 2007
> @@ -17,12 +17,4 @@
> specific language governing permissions and limitations
> under the License.
> -->
> -<sequences:rc2m xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> xmlns:sequences="http://www.example.com/sequences"
> xsi:type="sequences:TwoRCsMixed">
> - <b>1</b>
> -where will this appear? <a>foo</a>
> - <a>bar</a>
> - <b>2</b>
> - <split>pea</split>
> - <z>99</z>
> - <y>fred</y>
> -</sequences:rc2m>
> +<sequences:rc2m xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> xmlns:sequences="http://www.example.com/sequences"
> xsi:type="sequences:TwoRCsMixed"><b>1</b>where will this
> appear?<a>foo</a><a>bar</a><b>2</b><split>pea</split><z>99</z><y>fred</y></sequences:rc2m>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
> For additional commands, e-mail: tuscany-commits-help@ws.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org
Re: svn commit: r508530 - in /incubator/tuscany/java/sdo: ./ tools/src/test/java/com/example/sequences/impl/ tools/src/test/java/org/apache/tuscany/sdo/test/ tools/src/test/resources/
Posted by Frank Budinsky <fr...@ca.ibm.com>.
Did you run "mvn clean"? If you didn't, the .class file would have still
been around.
Frank.
"kelvin goodson" <ke...@gmail.com> wrote on 02/17/2007 11:00:50
AM:
> Guys,
> apologies for this. Is this an issue with svn remove not actually
> removing the file from the local space? Looking back at my command
prompt
> windows I see I did ...
>
> [INFO]
> [INFO]
> ------------------------------------------------------------------------
> [INFO] Reactor Summary:
> [INFO]
> ------------------------------------------------------------------------
> [INFO] Tuscany SDO Implementation Project .................... SUCCESS [
> 6.609s]
> [INFO] Tuscany SDO Implementation ............................ SUCCESS [
> 27.960s]
> [INFO] Tuscany SDO Tools ..................................... SUCCESS [
> 7.181s]
> [INFO] Tuscany SDO Maven Plugin .............................. SUCCESS [
> 2.794s]
> [INFO]
> ------------------------------------------------------------------------
> [INFO]
> ------------------------------------------------------------------------
> [INFO] BUILD SUCCESSFUL
> [INFO]
> ------------------------------------------------------------------------
> [INFO] Total time: 45 seconds
> [INFO] Finished at: Fri Feb 16 18:21:34 GMT 2007
> [INFO] Final Memory: 15M/34M
> [INFO]
> ------------------------------------------------------------------------
>
> C:\Development\patches\T-1102>
> with the commit happening just a few minutes later. So I can't explain
why
> my build didn't fail too.
>
>
>
> On 16/02/07, Frank Budinsky <fr...@ca.ibm.com> wrote:
> >
> > Kelvin removed StaticSequenceNoEmfTestCase, but it looks like he
forgot to
> > take it out of AllTests.java. I just fixed it.
> >
> > Thanks,
> > Frank.
> >
> > "Raymond Feng" <en...@gmail.com> wrote on 02/16/2007 01:37:13 PM:
> >
> > > Hi,
> > >
> > > I'm seeing a build failure:
> > >
> > > [INFO]
> > >
------------------------------------------------------------------------
> > > [ERROR] BUILD FAILURE
> > > [INFO]
> > >
------------------------------------------------------------------------
> >
> > > [INFO] Compilation failure
> > > C:
> > >
> >
> >
>
\Tuscany\java\sdo\tools\src\test\java\org\apache\tuscany\sdo\test\AllTests.jav
> > > a:[15,54] cannot find symbol
> > > symbol : class StaticSequenceNoEmfTestCase
> > > location: package org.apache.tuscany.sdo.test
> > >
> > > C:
> > >
> >
> >
>
\Tuscany\java\sdo\tools\src\test\java\org\apache\tuscany\sdo\test\AllTests.jav
> > > a:[15,54] cannot find symbol
> > > symbol : class StaticSequenceNoEmfTestCase
> > > location: package org.apache.tuscany.sdo.test
> > >
> > > It seems that you forgot to check in
StaticSequenceNoEmfTestCase.java.
> > >
> > > Thanks,
> > > Raymond
> > >
> > >
> > > ----- Original Message -----
> > > From: <ke...@apache.org>
> > > To: <tu...@ws.apache.org>
> > > Sent: Friday, February 16, 2007 10:28 AM
> > > Subject: svn commit: r508530 - in /incubator/tuscany/java/sdo: ./
> > > tools/src/test/java/com/example/sequences/impl/
> > > tools/src/test/java/org/apache/tuscany/sdo/test/
> > tools/src/test/resources/
> > >
> > >
> > > > Author: kelvingoodson
> > > > Date: Fri Feb 16 10:28:08 2007
> > > > New Revision: 508530
> > > >
> > > > URL: http://svn.apache.org/viewvc?view=rev&rev=508530
> > > > Log:
> > > > TUSCANY-1102 -- the validation introduced in EMF 2.2.2 highlit an
> > issue
> > > > with our generator, and some invalid test cases. This fix 1)
> > establishes
> > > > a dependency on EMF 2.2.2, 2) removes those tests which will be
> > updated
> > > > and incorporated into the fix for a new JIRA that will fix up the
> > codegen
> > > > issues 3) makes a manual fixup to the SequencesFactoryImpl which
shows
> >
> >
> > > > what the generator ought to have created and 4) Fixes up the xml
test
> > data
> > > > files and leaves them where they are pending reuse in the new
tests
> > > >
> > > > Removed:
> > > >
> > > >
> > >
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTestCase.
> > > java
> > > > Modified:
> > > > incubator/tuscany/java/sdo/pom.xml
> > > >
> > > >
> > >
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> > > java
> > > >
> > > >
> > >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> >
> > > xml
> > > >
> > > >
> > >
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> > > >
> > > >
> > >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> >
> > > xml
> > > >
> > > > Modified: incubator/tuscany/java/sdo/pom.xml
> > > > URL:
> > > > http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/pom.xml ?
> > > view=diff&rev=508530&r1=508529&r2=508530
> > > >
> > >
> >
> >
>
==============================================================================
> > > > --- incubator/tuscany/java/sdo/pom.xml (original)
> > > > +++ incubator/tuscany/java/sdo/pom.xml Fri Feb 16 10:28:08 2007
> > > > @@ -54,10 +54,13 @@
> > > > </snapshots>
> > > > </repository>
> > > > <repository>
> > > > - <!-- temporarily replace the eclipse
> > repo...
> > > id>eclipse.emf</id>
> > - <url>http://download.
> eclipse.
> > org/tools/emf/maven2</url -->
> > > > - <id>osuosl.org</id>
> > > > - <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2 </url>
> > > > + <!-- <id>eclipse.emf</id>
> > +
> <url>http:
> > //download.eclipse.org/tools/emf/maven2</url> -->
> > > > + <!-- <id> osuosl.org</id>
> > +
> >
> <url>http:
> > //ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
> > > > + <!-- temporarily using indiana state univ as
> eclipse
> > site
> > diesnt have 2.2.2 at the moment -->
> > > > + <id>indiana</id>
> > > > +
> > > > <url>
http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
> > > > <snapshots>
> > > > <enabled>true</enabled>
> > > > </snapshots>
> > > > @@ -66,7 +69,7 @@
> > > >
> > > > <properties>
> > > > <specVersion>2.1</specVersion>
> > > > - <emfVersion>2.2.1</emfVersion>
> > > > + <emfVersion> 2.2.2</emfVersion>
> > > > </properties>
> > > >
> > > > <modules>
> > > >
> > > > Modified:
> > > >
> > >
> >
>
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> >
> > > java
> > > > URL:
> > > > http://svn.apache.
> > >
> >
> >
>
org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> > > java?view=diff&rev=508530&r1=508529&r2=508530
> > > >
> > >
> >
> >
>
==============================================================================
> > > > ---
> > > >
> > >
> >
>
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> >
> > > java
> > > > (original)
> > > > +++
> > > >
> > >
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> > > java
> > > > Fri Feb 16 10:28:08 2007
> > > > @@ -346,13 +346,13 @@
> > > > new String[]
> > > > {
> > > > "name", "MixedQuote",
> > > > - "kind", "elementOnly"
> > > > + "kind", "mixed"
> > > > });
> > > > addXSDMapping
> > > >
((Property)mixedQuoteType.getProperties().get(MixedQuoteImpl.MIXED),
> > > > new String[]
> > > > {
> > > > - "kind", "element",
> > > > + "kind", "elementWildcard",
> > > > "name", "mixed"
> > > > });
> > > >
> > > > @@ -434,13 +434,13 @@
> > > > new String[]
> > > > {
> > > > "name", "MixedRepeatingChoice",
> > > > - "kind", "elementOnly"
> > > > + "kind", "mixed"
> > > > });
> > > > addXSDMapping
> > > >
> > > > ((Property)mixedRepeatingChoiceType.getProperties().
> > > get(MixedRepeatingChoiceImpl.MIXED),
> > > > new String[]
> > > > {
> > > > - "kind", "element",
> > > > + "kind", "elementWildcard",
> > > > "name", "mixed"
> > > > });
> > > >
> > > > @@ -448,8 +448,8 @@
> > > >
> > > > ((Property)mixedRepeatingChoiceType.getProperties().
> > > get(MixedRepeatingChoiceImpl.GROUP),
> > > > new String[]
> > > > {
> > > > - "kind", "element",
> > > > - "name", "group"
> > > > + "kind", "group",
> > > > + "name", "group:1"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -457,7 +457,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "a"
> > > > + "name", "a",
> > > > + "group", "#group:1"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -465,7 +466,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "b"
> > > > + "name", "b",
> > > > + "group", "#group:1"
> > > > });
> > > >
> > > > // TODO - kdk - is the order right? should kind, elementOnly
be
> > first
> > > > @@ -480,8 +482,8 @@
> > > >
> > > > ((Property)repeatingChoiceType.getProperties().
> > > get(RepeatingChoiceImpl.GROUP),
> > > > new String[]
> > > > {
> > > > - "kind", "element",
> > > > - "name", "group"
> > > > + "kind", "group",
> > > > + "name", "group:0"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -489,7 +491,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "a"
> > > > + "name", "a",
> > > > + "group", "#group:0"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -497,7 +500,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "b"
> > > > + "name", "b",
> > > > + "group", "#group:0"
> > > > });
> > > >
> > > > // TODO - kdk - is the order right? should kind, elementOnly
be
> > first
> > > > @@ -512,8 +516,8 @@
> > > > ((Property)twoRCsType.getProperties().get(TwoRCsImpl.GROUP),
> > > > new String[]
> > > > {
> > > > - "kind", "element",
> > > > - "name", "group"
> > > > + "kind", "group",
> > > > + "name", "group:0"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -521,7 +525,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "a"
> > > > + "name", "a",
> > > > + "group", "#group:0"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -529,7 +534,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "b"
> > > > + "name", "b",
> > > > + "group", "#group:0"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -544,8 +550,8 @@
> > > > ((Property)twoRCsType.getProperties().get(TwoRCsImpl.GROUP1),
> > > > new String[]
> > > > {
> > > > - "kind", "element",
> > > > - "name", "group1"
> > > > + "kind", "group",
> > > > + "name", "group:4"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -553,7 +559,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "y"
> > > > + "name", "y",
> > > > + "group", "#group:4"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -561,7 +568,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "z"
> > > > + "name", "z",
> > > > + "group", "#group:4"
> > > > });
> > > >
> > > > // TODO - kdk - is the order right? should kind, elementOnly
be
> > first
> > > > @@ -570,13 +578,13 @@
> > > > new String[]
> > > > {
> > > > "name", "TwoRCsMixed",
> > > > - "kind", "elementOnly"
> > > > + "kind", "mixed"
> > > > });
> > > > addXSDMapping
> > > >
((Property)twoRCsMixedType.getProperties().get(TwoRCsMixedImpl.MIXED),
> > > > new String[]
> > > > {
> > > > - "kind", "element",
> > > > + "kind", "elementWildcard",
> > > > "name", "mixed"
> > > > });
> > > >
> > > > @@ -584,8 +592,8 @@
> > > > ((Property)twoRCsMixedType.getProperties().get(
TwoRCsMixedImpl.GROUP
> > ),
> > > > new String[]
> > > > {
> > > > - "kind", "element",
> > > > - "name", "group"
> > > > + "kind", "group",
> > > > + "name", "group:1"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -593,7 +601,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "a"
> > > > + "name", "a",
> > > > + "group", "#group:1"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -601,7 +610,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "b"
> > > > + "name", "b",
> > > > + "group", "#group:1"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -616,8 +626,8 @@
> > > >
> > > >
> > ((Property)twoRCsMixedType.getProperties().get(
TwoRCsMixedImpl.GROUP1),
> > > > new String[]
> > > > {
> > > > - "kind", "element",
> > > > - "name", "group1"
> > > > + "kind", "group",
> > > > + "name", "group:5"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -625,7 +635,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "y"
> > > > + "name", "y",
> > > > + "group", "#group:5"
> > > > });
> > > >
> > > > addXSDMapping
> > > > @@ -633,7 +644,8 @@
> > > > new String[]
> > > > {
> > > > "kind", "element",
> > > > - "name", "z"
> > > > + "name", "z",
> > > > + "group", "#group:5"
> > > > });
> > > >
> > > >
> > > >
> > > > Modified:
> > > >
> > >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> >
> > > xml
> > > > URL:
> > > > http://svn.apache.
> > >
> >
> >
>
org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> > > xml?view=diff&rev=508530&r1=508529&r2=508530
> > > >
> > >
> >
> >
>
==============================================================================
> > > > ---
> > > >
> > >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> >
> > > xml
> > > > (original)
> > > > +++
> > > >
> > >
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> > > xml
> > > > Fri Feb 16 10:28:08 2007
> > > > @@ -17,9 +17,4 @@
> > > > specific language governing permissions and limitations
> > > > under the License.
> > > > -->
> > > > -<sequences:mrc xmlns:sequences="
http://www.example.com/sequences">
> > > > - <b>1</b>
> > > > - <a>foo</a>
> > > > -some mixed text <a>bar</a>
> > > > - <b>2</b>
> > > > -</sequences:mrc>
> > > > +<sequences:mrc
> > > >
> >
xmlns:sequences="http://www.example.com/sequences"><b>1</b><a>foo</a>some
> > > > mixed text<a>bar</a><b>2</b></sequences:mrc>
> > > >
> > > > Modified:
> > > >
> > >
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> > > > URL:
> > > > http://svn.apache.
> > >
> >
> >
>
org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.
> > > xml?view=diff&rev=508530&r1=508529&r2=508530
> > > >
> > >
> >
>
==============================================================================
> >
> > > > ---
> > > >
> > >
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> >
> > > > (original)
> > > > +++
> > > >
> > >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> >
> >
> > > > Fri Feb 16 10:28:08 2007
> > > > @@ -18,17 +18,10 @@
> > > > under the License.
> > > > -->
> > > > <sequences:mixedStockQuote
> > > > xmlns:sequences=" http://www.example.com/sequences">
> > > > -
> > > > - <symbol>fbnt</symbol>
> > > > -
> > > > - <companyName>FlyByNightTechnology</companyName>
> > > > -
> > > > + <symbol>fbnt</symbol>
> > > > + <companyName>FlyByNightTechnology</companyName>
> > > > some text
> > > > - <quotes>
> > > > - <price>2000.0 </price>
> > > > - </quotes>
> > > > -
> > > > + <quotes><price>2000.0</price></quotes>
> > > > more text
> > > > - <price>1000.0</price>
> > > > -
> > > > + <price>1000.0</price>
> > > > </sequences:mixedStockQuote>
> > > >
> > > > Modified:
> > > >
> > >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> >
> > > xml
> > > > URL:
> > > > http://svn.apache.
> > >
> >
> >
>
org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> > > xml?view=diff&rev=508530&r1=508529&r2=508530
> > > >
> > >
> >
> >
>
==============================================================================
> > > > ---
> > > >
> > >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> >
> > > xml
> > > > (original)
> > > > +++
> > > >
> > >
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> > > xml
> > > > Fri Feb 16 10:28:08 2007
> > > > @@ -17,12 +17,4 @@
> > > > specific language governing permissions and limitations
> > > > under the License.
> > > > -->
> > > > -<sequences:rc2m xmlns:xsi="
http://www.w3.org/2001/XMLSchema-instance
> > "
> >
> > > > xmlns:sequences="http://www.example.com/sequences"
> > > > xsi:type="sequences:TwoRCsMixed">
> > > > - <b>1</b>
> > > > -where will this appear? <a>foo</a>
> > > > - <a>bar</a>
> > > > - <b>2</b>
> > > > - <split>pea</split>
> > > > - <z>99</z>
> > > > - <y>fred</y>
> > > > -</sequences:rc2m>
> > > > +<sequences:rc2m
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance
> > "
> >
> > > > xmlns:sequences="http://www.example.com/sequences"
> > > > xsi:type="sequences:TwoRCsMixed"><b>1</b>where will this
> > > > appear?
> > >
> >
> >
>
<a>foo</a><a>bar</a><b>2</b><split>pea</split><z>99</z><y>fred</y></sequences:
> > > rc2m>
> > > >
> > > >
> > > >
> > > >
---------------------------------------------------------------------
> > > > To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
> > > > For additional commands, e-mail:
tuscany-commits-help@ws.apache.org
> > > >
> > >
> > >
> > >
---------------------------------------------------------------------
> > > To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
> > > For additional commands, e-mail: tuscany-dev-help@ws.apache.org
> > >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
> > For additional commands, e-mail: tuscany-dev-help@ws.apache.org
> >
> >
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org
Re: svn commit: r508530 - in /incubator/tuscany/java/sdo: ./ tools/src/test/java/com/example/sequences/impl/ tools/src/test/java/org/apache/tuscany/sdo/test/ tools/src/test/resources/
Posted by kelvin goodson <ke...@gmail.com>.
Guys,
apologies for this. Is this an issue with svn remove not actually
removing the file from the local space? Looking back at my command prompt
windows I see I did ...
[INFO]
[INFO]
------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
------------------------------------------------------------------------
[INFO] Tuscany SDO Implementation Project .................... SUCCESS [
6.609s]
[INFO] Tuscany SDO Implementation ............................ SUCCESS [
27.960s]
[INFO] Tuscany SDO Tools ..................................... SUCCESS [
7.181s]
[INFO] Tuscany SDO Maven Plugin .............................. SUCCESS [
2.794s]
[INFO]
------------------------------------------------------------------------
[INFO]
------------------------------------------------------------------------
[INFO] BUILD SUCCESSFUL
[INFO]
------------------------------------------------------------------------
[INFO] Total time: 45 seconds
[INFO] Finished at: Fri Feb 16 18:21:34 GMT 2007
[INFO] Final Memory: 15M/34M
[INFO]
------------------------------------------------------------------------
C:\Development\patches\T-1102>
with the commit happening just a few minutes later. So I can't explain why
my build didn't fail too.
On 16/02/07, Frank Budinsky <fr...@ca.ibm.com> wrote:
>
> Kelvin removed StaticSequenceNoEmfTestCase, but it looks like he forgot to
> take it out of AllTests.java. I just fixed it.
>
> Thanks,
> Frank.
>
> "Raymond Feng" <en...@gmail.com> wrote on 02/16/2007 01:37:13 PM:
>
> > Hi,
> >
> > I'm seeing a build failure:
> >
> > [INFO]
> > ------------------------------------------------------------------------
> > [ERROR] BUILD FAILURE
> > [INFO]
> > ------------------------------------------------------------------------
>
> > [INFO] Compilation failure
> > C:
> >
>
> \Tuscany\java\sdo\tools\src\test\java\org\apache\tuscany\sdo\test\AllTests.jav
> > a:[15,54] cannot find symbol
> > symbol : class StaticSequenceNoEmfTestCase
> > location: package org.apache.tuscany.sdo.test
> >
> > C:
> >
>
> \Tuscany\java\sdo\tools\src\test\java\org\apache\tuscany\sdo\test\AllTests.jav
> > a:[15,54] cannot find symbol
> > symbol : class StaticSequenceNoEmfTestCase
> > location: package org.apache.tuscany.sdo.test
> >
> > It seems that you forgot to check in StaticSequenceNoEmfTestCase.java.
> >
> > Thanks,
> > Raymond
> >
> >
> > ----- Original Message -----
> > From: <ke...@apache.org>
> > To: <tu...@ws.apache.org>
> > Sent: Friday, February 16, 2007 10:28 AM
> > Subject: svn commit: r508530 - in /incubator/tuscany/java/sdo: ./
> > tools/src/test/java/com/example/sequences/impl/
> > tools/src/test/java/org/apache/tuscany/sdo/test/
> tools/src/test/resources/
> >
> >
> > > Author: kelvingoodson
> > > Date: Fri Feb 16 10:28:08 2007
> > > New Revision: 508530
> > >
> > > URL: http://svn.apache.org/viewvc?view=rev&rev=508530
> > > Log:
> > > TUSCANY-1102 -- the validation introduced in EMF 2.2.2 highlit an
> issue
> > > with our generator, and some invalid test cases. This fix 1)
> establishes
> > > a dependency on EMF 2.2.2, 2) removes those tests which will be
> updated
> > > and incorporated into the fix for a new JIRA that will fix up the
> codegen
> > > issues 3) makes a manual fixup to the SequencesFactoryImpl which shows
>
>
> > > what the generator ought to have created and 4) Fixes up the xml test
> data
> > > files and leaves them where they are pending reuse in the new tests
> > >
> > > Removed:
> > >
> > >
> >
>
> incubator/tuscany/java/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTestCase.
> > java
> > > Modified:
> > > incubator/tuscany/java/sdo/pom.xml
> > >
> > >
> >
>
> incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> > java
> > >
> > >
> >
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
>
> > xml
> > >
> > >
> >
>
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> > >
> > >
> >
> incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
>
> > xml
> > >
> > > Modified: incubator/tuscany/java/sdo/pom.xml
> > > URL:
> > > http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/pom.xml ?
> > view=diff&rev=508530&r1=508529&r2=508530
> > >
> >
>
> ==============================================================================
> > > --- incubator/tuscany/java/sdo/pom.xml (original)
> > > +++ incubator/tuscany/java/sdo/pom.xml Fri Feb 16 10:28:08 2007
> > > @@ -54,10 +54,13 @@
> > > </snapshots>
> > > </repository>
> > > <repository>
> > > - <!-- temporarily replace the eclipse
> > repo...
> > id>eclipse.emf</id>
> > - <url>http://download.eclipse.
> > org/tools/emf/maven2</url -->
> > > - <id>osuosl.org</id>
> > > - <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2 </url>
> > > + <!-- <id>eclipse.emf</id>
> > + <url>http:
> > //download.eclipse.org/tools/emf/maven2</url> -->
> > > + <!-- <id> osuosl.org</id>
> > +
> > <url>http:
> > //ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
> > > + <!-- temporarily using indiana state univ as eclipse
> > site
> > diesnt have 2.2.2 at the moment -->
> > > + <id>indiana</id>
> > > +
> > > <url> http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
> > > <snapshots>
> > > <enabled>true</enabled>
> > > </snapshots>
> > > @@ -66,7 +69,7 @@
> > >
> > > <properties>
> > > <specVersion>2.1</specVersion>
> > > - <emfVersion>2.2.1</emfVersion>
> > > + <emfVersion> 2.2.2</emfVersion>
> > > </properties>
> > >
> > > <modules>
> > >
> > > Modified:
> > >
> >
> incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
>
> > java
> > > URL:
> > > http://svn.apache.
> >
>
> org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> > java?view=diff&rev=508530&r1=508529&r2=508530
> > >
> >
>
> ==============================================================================
> > > ---
> > >
> >
> incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
>
> > java
> > > (original)
> > > +++
> > >
> >
>
> incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> > java
> > > Fri Feb 16 10:28:08 2007
> > > @@ -346,13 +346,13 @@
> > > new String[]
> > > {
> > > "name", "MixedQuote",
> > > - "kind", "elementOnly"
> > > + "kind", "mixed"
> > > });
> > > addXSDMapping
> > > ((Property)mixedQuoteType.getProperties().get(MixedQuoteImpl.MIXED),
> > > new String[]
> > > {
> > > - "kind", "element",
> > > + "kind", "elementWildcard",
> > > "name", "mixed"
> > > });
> > >
> > > @@ -434,13 +434,13 @@
> > > new String[]
> > > {
> > > "name", "MixedRepeatingChoice",
> > > - "kind", "elementOnly"
> > > + "kind", "mixed"
> > > });
> > > addXSDMapping
> > >
> > > ((Property)mixedRepeatingChoiceType.getProperties().
> > get(MixedRepeatingChoiceImpl.MIXED),
> > > new String[]
> > > {
> > > - "kind", "element",
> > > + "kind", "elementWildcard",
> > > "name", "mixed"
> > > });
> > >
> > > @@ -448,8 +448,8 @@
> > >
> > > ((Property)mixedRepeatingChoiceType.getProperties().
> > get(MixedRepeatingChoiceImpl.GROUP),
> > > new String[]
> > > {
> > > - "kind", "element",
> > > - "name", "group"
> > > + "kind", "group",
> > > + "name", "group:1"
> > > });
> > >
> > > addXSDMapping
> > > @@ -457,7 +457,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "a"
> > > + "name", "a",
> > > + "group", "#group:1"
> > > });
> > >
> > > addXSDMapping
> > > @@ -465,7 +466,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "b"
> > > + "name", "b",
> > > + "group", "#group:1"
> > > });
> > >
> > > // TODO - kdk - is the order right? should kind, elementOnly be
> first
> > > @@ -480,8 +482,8 @@
> > >
> > > ((Property)repeatingChoiceType.getProperties().
> > get(RepeatingChoiceImpl.GROUP),
> > > new String[]
> > > {
> > > - "kind", "element",
> > > - "name", "group"
> > > + "kind", "group",
> > > + "name", "group:0"
> > > });
> > >
> > > addXSDMapping
> > > @@ -489,7 +491,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "a"
> > > + "name", "a",
> > > + "group", "#group:0"
> > > });
> > >
> > > addXSDMapping
> > > @@ -497,7 +500,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "b"
> > > + "name", "b",
> > > + "group", "#group:0"
> > > });
> > >
> > > // TODO - kdk - is the order right? should kind, elementOnly be
> first
> > > @@ -512,8 +516,8 @@
> > > ((Property)twoRCsType.getProperties().get(TwoRCsImpl.GROUP),
> > > new String[]
> > > {
> > > - "kind", "element",
> > > - "name", "group"
> > > + "kind", "group",
> > > + "name", "group:0"
> > > });
> > >
> > > addXSDMapping
> > > @@ -521,7 +525,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "a"
> > > + "name", "a",
> > > + "group", "#group:0"
> > > });
> > >
> > > addXSDMapping
> > > @@ -529,7 +534,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "b"
> > > + "name", "b",
> > > + "group", "#group:0"
> > > });
> > >
> > > addXSDMapping
> > > @@ -544,8 +550,8 @@
> > > ((Property)twoRCsType.getProperties().get(TwoRCsImpl.GROUP1),
> > > new String[]
> > > {
> > > - "kind", "element",
> > > - "name", "group1"
> > > + "kind", "group",
> > > + "name", "group:4"
> > > });
> > >
> > > addXSDMapping
> > > @@ -553,7 +559,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "y"
> > > + "name", "y",
> > > + "group", "#group:4"
> > > });
> > >
> > > addXSDMapping
> > > @@ -561,7 +568,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "z"
> > > + "name", "z",
> > > + "group", "#group:4"
> > > });
> > >
> > > // TODO - kdk - is the order right? should kind, elementOnly be
> first
> > > @@ -570,13 +578,13 @@
> > > new String[]
> > > {
> > > "name", "TwoRCsMixed",
> > > - "kind", "elementOnly"
> > > + "kind", "mixed"
> > > });
> > > addXSDMapping
> > > ((Property)twoRCsMixedType.getProperties().get(TwoRCsMixedImpl.MIXED),
> > > new String[]
> > > {
> > > - "kind", "element",
> > > + "kind", "elementWildcard",
> > > "name", "mixed"
> > > });
> > >
> > > @@ -584,8 +592,8 @@
> > > ((Property)twoRCsMixedType.getProperties().get( TwoRCsMixedImpl.GROUP
> ),
> > > new String[]
> > > {
> > > - "kind", "element",
> > > - "name", "group"
> > > + "kind", "group",
> > > + "name", "group:1"
> > > });
> > >
> > > addXSDMapping
> > > @@ -593,7 +601,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "a"
> > > + "name", "a",
> > > + "group", "#group:1"
> > > });
> > >
> > > addXSDMapping
> > > @@ -601,7 +610,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "b"
> > > + "name", "b",
> > > + "group", "#group:1"
> > > });
> > >
> > > addXSDMapping
> > > @@ -616,8 +626,8 @@
> > >
> > >
> ((Property)twoRCsMixedType.getProperties().get( TwoRCsMixedImpl.GROUP1),
> > > new String[]
> > > {
> > > - "kind", "element",
> > > - "name", "group1"
> > > + "kind", "group",
> > > + "name", "group:5"
> > > });
> > >
> > > addXSDMapping
> > > @@ -625,7 +635,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "y"
> > > + "name", "y",
> > > + "group", "#group:5"
> > > });
> > >
> > > addXSDMapping
> > > @@ -633,7 +644,8 @@
> > > new String[]
> > > {
> > > "kind", "element",
> > > - "name", "z"
> > > + "name", "z",
> > > + "group", "#group:5"
> > > });
> > >
> > >
> > >
> > > Modified:
> > >
> >
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
>
> > xml
> > > URL:
> > > http://svn.apache.
> >
>
> org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> > xml?view=diff&rev=508530&r1=508529&r2=508530
> > >
> >
>
> ==============================================================================
> > > ---
> > >
> >
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
>
> > xml
> > > (original)
> > > +++
> > >
> >
>
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> > xml
> > > Fri Feb 16 10:28:08 2007
> > > @@ -17,9 +17,4 @@
> > > specific language governing permissions and limitations
> > > under the License.
> > > -->
> > > -<sequences:mrc xmlns:sequences=" http://www.example.com/sequences">
> > > - <b>1</b>
> > > - <a>foo</a>
> > > -some mixed text <a>bar</a>
> > > - <b>2</b>
> > > -</sequences:mrc>
> > > +<sequences:mrc
> > >
> xmlns:sequences="http://www.example.com/sequences"><b>1</b><a>foo</a>some
> > > mixed text<a>bar</a><b>2</b></sequences:mrc>
> > >
> > > Modified:
> > >
> >
>
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> > > URL:
> > > http://svn.apache.
> >
>
> org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.
> > xml?view=diff&rev=508530&r1=508529&r2=508530
> > >
> >
> ==============================================================================
>
> > > ---
> > >
> >
>
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
>
> > > (original)
> > > +++
> > >
> >
> incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
>
>
> > > Fri Feb 16 10:28:08 2007
> > > @@ -18,17 +18,10 @@
> > > under the License.
> > > -->
> > > <sequences:mixedStockQuote
> > > xmlns:sequences=" http://www.example.com/sequences">
> > > -
> > > - <symbol>fbnt</symbol>
> > > -
> > > - <companyName>FlyByNightTechnology</companyName>
> > > -
> > > + <symbol>fbnt</symbol>
> > > + <companyName>FlyByNightTechnology</companyName>
> > > some text
> > > - <quotes>
> > > - <price>2000.0 </price>
> > > - </quotes>
> > > -
> > > + <quotes><price>2000.0</price></quotes>
> > > more text
> > > - <price>1000.0</price>
> > > -
> > > + <price>1000.0</price>
> > > </sequences:mixedStockQuote>
> > >
> > > Modified:
> > >
> >
> incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
>
> > xml
> > > URL:
> > > http://svn.apache.
> >
>
> org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> > xml?view=diff&rev=508530&r1=508529&r2=508530
> > >
> >
>
> ==============================================================================
> > > ---
> > >
> >
> incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
>
> > xml
> > > (original)
> > > +++
> > >
> >
>
> incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> > xml
> > > Fri Feb 16 10:28:08 2007
> > > @@ -17,12 +17,4 @@
> > > specific language governing permissions and limitations
> > > under the License.
> > > -->
> > > -<sequences:rc2m xmlns:xsi=" http://www.w3.org/2001/XMLSchema-instance
> "
>
> > > xmlns:sequences="http://www.example.com/sequences"
> > > xsi:type="sequences:TwoRCsMixed">
> > > - <b>1</b>
> > > -where will this appear? <a>foo</a>
> > > - <a>bar</a>
> > > - <b>2</b>
> > > - <split>pea</split>
> > > - <z>99</z>
> > > - <y>fred</y>
> > > -</sequences:rc2m>
> > > +<sequences:rc2m xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance
> "
>
> > > xmlns:sequences="http://www.example.com/sequences"
> > > xsi:type="sequences:TwoRCsMixed"><b>1</b>where will this
> > > appear?
> >
>
> <a>foo</a><a>bar</a><b>2</b><split>pea</split><z>99</z><y>fred</y></sequences:
> > rc2m>
> > >
> > >
> > >
> > > ---------------------------------------------------------------------
> > > To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
> > > For additional commands, e-mail: tuscany-commits-help@ws.apache.org
> > >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
> > For additional commands, e-mail: tuscany-dev-help@ws.apache.org
> >
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
> For additional commands, e-mail: tuscany-dev-help@ws.apache.org
>
>
Re: svn commit: r508530 - in /incubator/tuscany/java/sdo: ./ tools/src/test/java/com/example/sequences/impl/ tools/src/test/java/org/apache/tuscany/sdo/test/ tools/src/test/resources/
Posted by Frank Budinsky <fr...@ca.ibm.com>.
Kelvin removed StaticSequenceNoEmfTestCase, but it looks like he forgot to
take it out of AllTests.java. I just fixed it.
Thanks,
Frank.
"Raymond Feng" <en...@gmail.com> wrote on 02/16/2007 01:37:13 PM:
> Hi,
>
> I'm seeing a build failure:
>
> [INFO]
> ------------------------------------------------------------------------
> [ERROR] BUILD FAILURE
> [INFO]
> ------------------------------------------------------------------------
> [INFO] Compilation failure
> C:
>
\Tuscany\java\sdo\tools\src\test\java\org\apache\tuscany\sdo\test\AllTests.jav
> a:[15,54] cannot find symbol
> symbol : class StaticSequenceNoEmfTestCase
> location: package org.apache.tuscany.sdo.test
>
> C:
>
\Tuscany\java\sdo\tools\src\test\java\org\apache\tuscany\sdo\test\AllTests.jav
> a:[15,54] cannot find symbol
> symbol : class StaticSequenceNoEmfTestCase
> location: package org.apache.tuscany.sdo.test
>
> It seems that you forgot to check in StaticSequenceNoEmfTestCase.java.
>
> Thanks,
> Raymond
>
>
> ----- Original Message -----
> From: <ke...@apache.org>
> To: <tu...@ws.apache.org>
> Sent: Friday, February 16, 2007 10:28 AM
> Subject: svn commit: r508530 - in /incubator/tuscany/java/sdo: ./
> tools/src/test/java/com/example/sequences/impl/
> tools/src/test/java/org/apache/tuscany/sdo/test/
tools/src/test/resources/
>
>
> > Author: kelvingoodson
> > Date: Fri Feb 16 10:28:08 2007
> > New Revision: 508530
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=508530
> > Log:
> > TUSCANY-1102 -- the validation introduced in EMF 2.2.2 highlit an
issue
> > with our generator, and some invalid test cases. This fix 1)
establishes
> > a dependency on EMF 2.2.2, 2) removes those tests which will be
updated
> > and incorporated into the fix for a new JIRA that will fix up the
codegen
> > issues 3) makes a manual fixup to the SequencesFactoryImpl which shows
> > what the generator ought to have created and 4) Fixes up the xml test
data
> > files and leaves them where they are pending reuse in the new tests
> >
> > Removed:
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTestCase.
> java
> > Modified:
> > incubator/tuscany/java/sdo/pom.xml
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> java
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> xml
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> >
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> xml
> >
> > Modified: incubator/tuscany/java/sdo/pom.xml
> > URL:
> > http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/pom.xml?
> view=diff&rev=508530&r1=508529&r2=508530
> >
>
==============================================================================
> > --- incubator/tuscany/java/sdo/pom.xml (original)
> > +++ incubator/tuscany/java/sdo/pom.xml Fri Feb 16 10:28:08 2007
> > @@ -54,10 +54,13 @@
> > </snapshots>
> > </repository>
> > <repository>
> > - <!-- temporarily replace the eclipse
> repo...
> id>eclipse.emf</id>
> - <url>http://download.eclipse.
> org/tools/emf/maven2</url -->
> > - <id>osuosl.org</id>
> > - <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url>
> > + <!-- <id>eclipse.emf</id>
> + <url>http:
> //download.eclipse.org/tools/emf/maven2</url> -->
> > + <!-- <id>osuosl.org</id>
> +
> <url>http:
> //ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> -->
> > + <!-- temporarily using indiana state univ as eclipse
> site
> diesnt have 2.2.2 at the moment -->
> > + <id>indiana</id>
> > +
> > <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
> > <snapshots>
> > <enabled>true</enabled>
> > </snapshots>
> > @@ -66,7 +69,7 @@
> >
> > <properties>
> > <specVersion>2.1</specVersion>
> > - <emfVersion>2.2.1</emfVersion>
> > + <emfVersion>2.2.2</emfVersion>
> > </properties>
> >
> > <modules>
> >
> > Modified:
> >
>
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> java
> > URL:
> > http://svn.apache.
>
org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> java?view=diff&rev=508530&r1=508529&r2=508530
> >
>
==============================================================================
> > ---
> >
>
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> java
> > (original)
> > +++
> >
>
incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.
> java
> > Fri Feb 16 10:28:08 2007
> > @@ -346,13 +346,13 @@
> > new String[]
> > {
> > "name", "MixedQuote",
> > - "kind", "elementOnly"
> > + "kind", "mixed"
> > });
> > addXSDMapping
> > ((Property)mixedQuoteType.getProperties().get(MixedQuoteImpl.MIXED),
> > new String[]
> > {
> > - "kind", "element",
> > + "kind", "elementWildcard",
> > "name", "mixed"
> > });
> >
> > @@ -434,13 +434,13 @@
> > new String[]
> > {
> > "name", "MixedRepeatingChoice",
> > - "kind", "elementOnly"
> > + "kind", "mixed"
> > });
> > addXSDMapping
> >
> > ((Property)mixedRepeatingChoiceType.getProperties().
> get(MixedRepeatingChoiceImpl.MIXED),
> > new String[]
> > {
> > - "kind", "element",
> > + "kind", "elementWildcard",
> > "name", "mixed"
> > });
> >
> > @@ -448,8 +448,8 @@
> >
> > ((Property)mixedRepeatingChoiceType.getProperties().
> get(MixedRepeatingChoiceImpl.GROUP),
> > new String[]
> > {
> > - "kind", "element",
> > - "name", "group"
> > + "kind", "group",
> > + "name", "group:1"
> > });
> >
> > addXSDMapping
> > @@ -457,7 +457,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "a"
> > + "name", "a",
> > + "group", "#group:1"
> > });
> >
> > addXSDMapping
> > @@ -465,7 +466,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "b"
> > + "name", "b",
> > + "group", "#group:1"
> > });
> >
> > // TODO - kdk - is the order right? should kind, elementOnly be
first
> > @@ -480,8 +482,8 @@
> >
> > ((Property)repeatingChoiceType.getProperties().
> get(RepeatingChoiceImpl.GROUP),
> > new String[]
> > {
> > - "kind", "element",
> > - "name", "group"
> > + "kind", "group",
> > + "name", "group:0"
> > });
> >
> > addXSDMapping
> > @@ -489,7 +491,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "a"
> > + "name", "a",
> > + "group", "#group:0"
> > });
> >
> > addXSDMapping
> > @@ -497,7 +500,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "b"
> > + "name", "b",
> > + "group", "#group:0"
> > });
> >
> > // TODO - kdk - is the order right? should kind, elementOnly be
first
> > @@ -512,8 +516,8 @@
> > ((Property)twoRCsType.getProperties().get(TwoRCsImpl.GROUP),
> > new String[]
> > {
> > - "kind", "element",
> > - "name", "group"
> > + "kind", "group",
> > + "name", "group:0"
> > });
> >
> > addXSDMapping
> > @@ -521,7 +525,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "a"
> > + "name", "a",
> > + "group", "#group:0"
> > });
> >
> > addXSDMapping
> > @@ -529,7 +534,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "b"
> > + "name", "b",
> > + "group", "#group:0"
> > });
> >
> > addXSDMapping
> > @@ -544,8 +550,8 @@
> > ((Property)twoRCsType.getProperties().get(TwoRCsImpl.GROUP1),
> > new String[]
> > {
> > - "kind", "element",
> > - "name", "group1"
> > + "kind", "group",
> > + "name", "group:4"
> > });
> >
> > addXSDMapping
> > @@ -553,7 +559,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "y"
> > + "name", "y",
> > + "group", "#group:4"
> > });
> >
> > addXSDMapping
> > @@ -561,7 +568,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "z"
> > + "name", "z",
> > + "group", "#group:4"
> > });
> >
> > // TODO - kdk - is the order right? should kind, elementOnly be
first
> > @@ -570,13 +578,13 @@
> > new String[]
> > {
> > "name", "TwoRCsMixed",
> > - "kind", "elementOnly"
> > + "kind", "mixed"
> > });
> > addXSDMapping
> > ((Property)twoRCsMixedType.getProperties().get(TwoRCsMixedImpl.MIXED),
> > new String[]
> > {
> > - "kind", "element",
> > + "kind", "elementWildcard",
> > "name", "mixed"
> > });
> >
> > @@ -584,8 +592,8 @@
> > ((Property)twoRCsMixedType.getProperties().get(TwoRCsMixedImpl.GROUP),
> > new String[]
> > {
> > - "kind", "element",
> > - "name", "group"
> > + "kind", "group",
> > + "name", "group:1"
> > });
> >
> > addXSDMapping
> > @@ -593,7 +601,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "a"
> > + "name", "a",
> > + "group", "#group:1"
> > });
> >
> > addXSDMapping
> > @@ -601,7 +610,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "b"
> > + "name", "b",
> > + "group", "#group:1"
> > });
> >
> > addXSDMapping
> > @@ -616,8 +626,8 @@
> >
> >
((Property)twoRCsMixedType.getProperties().get(TwoRCsMixedImpl.GROUP1),
> > new String[]
> > {
> > - "kind", "element",
> > - "name", "group1"
> > + "kind", "group",
> > + "name", "group:5"
> > });
> >
> > addXSDMapping
> > @@ -625,7 +635,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "y"
> > + "name", "y",
> > + "group", "#group:5"
> > });
> >
> > addXSDMapping
> > @@ -633,7 +644,8 @@
> > new String[]
> > {
> > "kind", "element",
> > - "name", "z"
> > + "name", "z",
> > + "group", "#group:5"
> > });
> >
> >
> >
> > Modified:
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> xml
> > URL:
> > http://svn.apache.
>
org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> xml?view=diff&rev=508530&r1=508529&r2=508530
> >
>
==============================================================================
> > ---
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> xml
> > (original)
> > +++
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.
> xml
> > Fri Feb 16 10:28:08 2007
> > @@ -17,9 +17,4 @@
> > specific language governing permissions and limitations
> > under the License.
> > -->
> > -<sequences:mrc xmlns:sequences="http://www.example.com/sequences">
> > - <b>1</b>
> > - <a>foo</a>
> > -some mixed text <a>bar</a>
> > - <b>2</b>
> > -</sequences:mrc>
> > +<sequences:mrc
> >
xmlns:sequences="http://www.example.com/sequences"><b>1</b><a>foo</a>some
> > mixed text<a>bar</a><b>2</b></sequences:mrc>
> >
> > Modified:
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> > URL:
> > http://svn.apache.
>
org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.
> xml?view=diff&rev=508530&r1=508529&r2=508530
> >
>
==============================================================================
> > ---
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> > (original)
> > +++
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
> > Fri Feb 16 10:28:08 2007
> > @@ -18,17 +18,10 @@
> > under the License.
> > -->
> > <sequences:mixedStockQuote
> > xmlns:sequences="http://www.example.com/sequences">
> > -
> > - <symbol>fbnt</symbol>
> > -
> > - <companyName>FlyByNightTechnology</companyName>
> > -
> > + <symbol>fbnt</symbol>
> > + <companyName>FlyByNightTechnology</companyName>
> > some text
> > - <quotes>
> > - <price>2000.0</price>
> > - </quotes>
> > -
> > + <quotes><price>2000.0</price></quotes>
> > more text
> > - <price>1000.0</price>
> > -
> > + <price>1000.0</price>
> > </sequences:mixedStockQuote>
> >
> > Modified:
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> xml
> > URL:
> > http://svn.apache.
>
org/viewvc/incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> xml?view=diff&rev=508530&r1=508529&r2=508530
> >
>
==============================================================================
> > ---
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> xml
> > (original)
> > +++
> >
>
incubator/tuscany/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.
> xml
> > Fri Feb 16 10:28:08 2007
> > @@ -17,12 +17,4 @@
> > specific language governing permissions and limitations
> > under the License.
> > -->
> > -<sequences:rc2m xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> > xmlns:sequences="http://www.example.com/sequences"
> > xsi:type="sequences:TwoRCsMixed">
> > - <b>1</b>
> > -where will this appear? <a>foo</a>
> > - <a>bar</a>
> > - <b>2</b>
> > - <split>pea</split>
> > - <z>99</z>
> > - <y>fred</y>
> > -</sequences:rc2m>
> > +<sequences:rc2m xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> > xmlns:sequences="http://www.example.com/sequences"
> > xsi:type="sequences:TwoRCsMixed"><b>1</b>where will this
> > appear?
>
<a>foo</a><a>bar</a><b>2</b><split>pea</split><z>99</z><y>fred</y></sequences:
> rc2m>
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
> > For additional commands, e-mail: tuscany-commits-help@ws.apache.org
> >
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
> For additional commands, e-mail: tuscany-dev-help@ws.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org