I am sorry but wouldn't it be a move forward to remove those generics?
And I thought we have decided to be on Java 5?
On 9/6/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
>
>
> Revision 796 Author sirenian Date 2007-09-07 01:42:17 -0500 (Fri, 07 Sep
> 2007)
> Log Message [EK] Reverted... sorry, Shane, no generics please!
>
> Modified Paths
>
> trunk/core/jbehave-core.iml
> trunk/core/src/behaviour/org/jbehave/core/AllBehaviours.java
> trunk/core/src/behaviour/org/jbehave/core/behaviour/BehaviourClassBehaviour.java
> trunk/core/src/java/org/jbehave/core/BehaviourRunner.java
> trunk/core/src/java/org/jbehave/core/behaviour/BehaviourClass.java
> trunk/core/src/java/org/jbehave/core/behaviour/MethodVerifier.java
> trunk/extensions/ant/ant.iml
> trunk/extensions/jmock/jmock-extension.iml
> trunk/extensions/junit/junit-extension.iml
> trunk/extensions/swing/swing-extension.iml
> trunk/jbehave.ipr
> trunk/lib/lib.iml
> trunk/website/website.iml
> Removed Paths
>
> trunk/lib/test/
>
> Diff
> Modified: trunk/core/jbehave-core.iml (795 => 796) ---
> trunk/core/jbehave-core.iml 2007-09-07 05:19:51 UTC (rev 795)
> +++ trunk/core/jbehave-core.iml 2007-09-07 06:42:17 UTC (rev 796)
> @@ -1,5 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<module relativePaths="true" type="JAVA_MODULE" version="4">
> +<module version="4" relativePaths="true" type="JAVA_MODULE">
> + <component name="ModuleRootManager" />
> <component name="NewModuleRootManager"
> inherit-compiler-output="false">
> <output url="file://$MODULE_DIR$/classes" />
> <exclude-output />
> @@ -10,7 +11,6 @@
> <orderEntry type="inheritedJdk" />
> <orderEntry type="sourceFolder" forTests="false" />
> <orderEntry type="module" module-name="swing-extension" />
> - <orderEntry type="module" module-name="lib" />
> <orderEntryProperties />
> </component>
> <component name="VcsManagerConfiguration">
>
>
> Modified:
> trunk/core/src/behaviour/org/jbehave/core/AllBehaviours.java
> (795 => 796) ---
> trunk/core/src/behaviour/org/jbehave/core/AllBehaviours.java
> 2007-09-07 05:19:51 UTC (rev 795)
> +++
> trunk/core/src/behaviour/org/jbehave/core/AllBehaviours.java
> 2007-09-07 06:42:17 UTC (rev 796)
> @@ -7,11 +7,32 @@
> */
> package org.jbehave.core;
>
> -import net.sf.cotta.jbehave.BehavioursLoader;
> +import org.jbehave.core.behaviour.BehaviourBehaviours;
> import org.jbehave.core.behaviour.Behaviours;
> +import org.jbehave.core.exception.ExceptionBehaviours;
> +import org.jbehave.core.listener.ListenerBehaviours;
> +import org.jbehave.core.matchers.MatchersBehaviours;
> +import org.jbehave.core.minimock.MiniMockBehaviours;
> +import org.jbehave.core.mock.MockBehaviours;
> +import org.jbehave.core.result.ResultBehaviours;
> +import org.jbehave.core.story.StoryBehaviours;
> +import org.jbehave.core.threaded.ThreadedBehaviours;
> +import org.jbehave.core.util.UtilBehaviours;
>
> public class AllBehaviours implements Behaviours {
> public Class[] getBehaviours() {
> - return new BehavioursLoader(getClass()).loadBehaviours();
> + return new Class[] {
> + BehaviourRunnerBehaviour.class,
> + BehaviourBehaviours.class,
> + ExceptionBehaviours.class,
> + ListenerBehaviours.class,
> + MatchersBehaviours.class,
> + MiniMockBehaviours.class,
> + MockBehaviours.class,
> + ResultBehaviours.class,
> + StoryBehaviours.class,
> + ThreadedBehaviours.class,
> + UtilBehaviours.class
> + };
> }
> }
>
>
> Modified:
> trunk/core/src/behaviour/org/jbehave/core/behaviour/BehaviourClassBehaviour.java
> (795 => 796) ---
> trunk/core/src/behaviour/org/jbehave/core/behaviour/BehaviourClassBehaviour.java
> 2007-09-07 05:19:51 UTC (rev 795)
> +++
> trunk/core/src/behaviour/org/jbehave/core/behaviour/BehaviourClassBehaviour.java
> 2007-09-07 06:42:17 UTC (rev 796)
> @@ -24,6 +24,8 @@
> */
> public class BehaviourClassBehaviour extends UsingMiniMock {
>
> + private BehaviourVerifier nullVerifier = new
> BehaviourVerifier(BehaviourListener.NULL);
> +
> public static class ClassWithOneBehaviourMethod {
> public void shouldDoOneThing() {}
> }
> @@ -39,26 +41,41 @@
> }
> };
> }
> -
> +
> + private Matcher isBehaviourMethodFor(final String name) {
> + return new Matcher() {
> + public boolean matches(Object arg) {
> + BehaviourMethod behaviourMethod = (BehaviourMethod)arg;
> + return behaviourMethod != null &&
> behaviourMethod.method().getName().equals(name);
> + }
> + public String toString() {
> + return "behaviour method for " + name;
> + }
> + };
> + }
> +
> public void shouldVerifySingleBehaviourMethod() throws
> Exception {
> // given
> Mock listener = mock(BehaviourListener.class);
> - listener.expects("before").once();
> - listener.expects("after").once();
> - listener.expects("gotResult").once();
> + final Behaviour[] capturedBehaviour = new Behaviour[1]; // the behaviour
> +
> + BehaviourVerifier verifier = new BehaviourVerifier(null) { // hand-rolled
> mock for concrete class
> + public void verifyBehaviour(Behaviour behaviour) {
> + capturedBehaviour[0] = behaviour;
> + }
> + };
> + Behaviour behaviour = new
> BehaviourClass(ClassWithOneBehaviourMethod.class,
> verifier);
>
> - BehaviourClass behaviour = new
> BehaviourClass(ClassWithOneBehaviourMethod.class);
> -
> // when
> behaviour.verifyTo((BehaviourListener) listener);
>
> // then
> - listener.verify();
> + ensureThat(capturedBehaviour[0],
> isBehaviourMethodFor("shouldDoOneThing"));
> }
>
> public void shouldCountSingleBehaviourMethod() throws
> Exception {
> // given
> - Behaviour behaviour = new
> BehaviourClass(ClassWithOneBehaviourMethod.class);
> + Behaviour behaviour = new
> BehaviourClass(ClassWithOneBehaviourMethod.class,
> nullVerifier);
>
> // then
> ensureThat(behaviour.countBehaviours(), eq(1));
> @@ -73,7 +90,7 @@
> // given
> Mock listener = mock(BehaviourListener.class);
> Behaviour behaviour = new BehaviourClass(
> - ClassWithTwoBehaviourMethods.class);
> + ClassWithTwoBehaviourMethods.class, new
> BehaviourVerifier((BehaviourListener) listener));
>
> // expect
> listener.expects("gotResult").with(successfulResultFromMethodCalled("shouldDoOneThing"));
> @@ -88,14 +105,14 @@
>
> public void shouldCountMultipleBehaviourMethods() throws
> Exception {
> // given
> - Behaviour behaviour = new
> BehaviourClass(ClassWithTwoBehaviourMethods.class);
> + Behaviour behaviour = new
> BehaviourClass(ClassWithTwoBehaviourMethods.class,
> nullVerifier);
>
> // then
> ensureThat(behaviour.countBehaviours(), eq(2));
> }
>
> public void shouldOnlyRunTheOnesSpecified() {
> - BehaviourClass behaviour = new
> BehaviourClass(ClassWithTwoBehaviourMethods.class,
> "shouldDoOneThing");
> + BehaviourClass behaviour = new
> BehaviourClass(ClassWithTwoBehaviourMethods.class,
> "shouldDoOneThing", nullVerifier);
> ensureThat(behaviour.countBehaviours(), eq(1));
> }
>
> @@ -115,7 +132,7 @@
> // given
> Mock listener = mock(BehaviourListener.class);
> Behaviour behaviour = new BehaviourClass(
> - ClassWithNestedClasses.class);
> + ClassWithNestedClasses.class, new
> BehaviourVerifier((BehaviourListener) listener));
>
> // expect
> listener.expects("gotResult").with(successfulResultFromMethodCalled("shouldDoSomething1"));
> @@ -130,7 +147,7 @@
>
> public void shouldCountNestedBehaviourClasses() throws
> Exception {
> // given
> - Behaviour behaviour = new BehaviourClass(ClassWithNestedClasses.class);
> + Behaviour behaviour = new BehaviourClass(ClassWithNestedClasses.class,
> nullVerifier);
>
> // when
> int count = behaviour.countBehaviours();
> @@ -149,7 +166,7 @@
> // given
> Mock listener = mock(BehaviourListener.class);
> Behaviour behaviour = new BehaviourClass(
> - ClassWithDeeplyNestedClasses.class);
> + ClassWithDeeplyNestedClasses.class, new
> BehaviourVerifier((BehaviourListener) listener));
>
> // expect
> listener.expects("gotResult").with(successfulResultFromMethodCalled("shouldDoSomething1"));
> @@ -164,7 +181,7 @@
>
> public void shouldCountDeeplyNestedBehaviourMethods()
> throws Exception {
> // given
> - Behaviour behaviour = new
> BehaviourClass(ClassWithDeeplyNestedClasses.class);
> + Behaviour behaviour = new
> BehaviourClass(ClassWithDeeplyNestedClasses.class,
> nullVerifier);
>
> // when
> int count = behaviour.countBehaviours();
> @@ -180,7 +197,7 @@
> public void
> shouldIgnorePublicMethodsThatDontStartWithShould() throws
> Exception {
> // given
> Mock listener = mock(BehaviourListener.class);
> - Behaviour behaviour = new BehaviourClass(HasNoBehaviourMethods.class);
> + Behaviour behaviour = new BehaviourClass(HasNoBehaviourMethods.class,
> nullVerifier);
>
> // expect
> listener.expects("gotResult").never();
> @@ -199,7 +216,7 @@
> public void
> shouldIgnoreNonPublicMethodsThatStartWithShould() throws
> Exception {
> // given
> Mock listener = mock(BehaviourListener.class);
> - Behaviour behaviour = new
> BehaviourClass(HasNonPublicBehaviourMethod.class);
> + Behaviour behaviour = new
> BehaviourClass(HasNonPublicBehaviourMethod.class,
> nullVerifier);
>
> // expect
> listener.expects("gotResult").never();
> @@ -211,7 +228,7 @@
> verifyMocks();
> }
>
> - private static List<CapturesClassInstance> instances;
> + private static List instances;
>
> public static class CapturesClassInstance {
> public void shouldCaptureInstance() {
> @@ -224,9 +241,9 @@
>
> public void
> shouldCreateNewInstanceForEachBehaviourMethod() throws
> Exception {
> // given
> - instances = new ArrayList<CapturesClassInstance>();
> + instances = new ArrayList();
> BehaviourListener nullListener = (BehaviourListener)
> stub(BehaviourListener.class);
> - Behaviour behaviour = new BehaviourClass(CapturesClassInstance.class);
> + Behaviour behaviour = new BehaviourClass(CapturesClassInstance.class,
> nullVerifier);
>
> // when
> behaviour.verifyTo(nullListener);
>
>
> Modified:
> trunk/core/src/java/org/jbehave/core/BehaviourRunner.java
> (795 => 796) ---
> trunk/core/src/java/org/jbehave/core/BehaviourRunner.java
> 2007-09-07 05:19:51 UTC (rev 795)
> +++
> trunk/core/src/java/org/jbehave/core/BehaviourRunner.java
> 2007-09-07 06:42:17 UTC (rev 796)
> @@ -74,7 +74,7 @@
> public void verifyBehaviour(Class classToVerify, String methodName) {
> BehaviourListener listener = new PlainTextListener(writer, new Timer());
> BehaviourVerifier verifier = new BehaviourVerifier(listener);
> - verifier.verifyBehaviour(new BehaviourClass(classToVerify, methodName));
> + verifier.verifyBehaviour(new BehaviourClass(classToVerify, methodName,
> verifier));
> listener.printReport();
> succeeded = succeeded && !listener.hasBehaviourFailures();
> }
>
>
> Modified:
> trunk/core/src/java/org/jbehave/core/behaviour/BehaviourClass.java
> (795 => 796) ---
> trunk/core/src/java/org/jbehave/core/behaviour/BehaviourClass.java
> 2007-09-07 05:19:51 UTC (rev 795)
> +++
> trunk/core/src/java/org/jbehave/core/behaviour/BehaviourClass.java
> 2007-09-07 06:42:17 UTC (rev 796)
> @@ -24,6 +24,7 @@
>
> private static final String BEHAVIOUR_METHOD_PREFIX = "should";
> private final Class classToVerify;
> + private final BehaviourVerifier verifier;
> private Matcher methodFilter;
> public static final Matcher ALL_METHODS = new Matcher() {
> public boolean matches(Object arg) {
> @@ -35,14 +36,19 @@
> return ((Method)
> arg).getName().startsWith(BEHAVIOUR_METHOD_PREFIX);
> }
> };
> -
> +
> public BehaviourClass(Class classToVerify) {
> - this(classToVerify, "");
> + this(classToVerify, new BehaviourVerifier());
> }
>
> - public BehaviourClass(Class classToVerify, final String methodName) {
> + public BehaviourClass(Class classToVerify, BehaviourVerifier verifier) {
> + this(classToVerify, "", verifier);
> + }
> +
> + public BehaviourClass(Class classToVerify, final String methodName,
> BehaviourVerifier verifier) {
> this.classToVerify = classToVerify;
> -
> + this.verifier = verifier;
> +
> if (methodName.length() == 0) {
> this.methodFilter = ALL_METHODS;
> } else {
> @@ -59,7 +65,7 @@
> }
>
> public void verifyTo(BehaviourListener listener) {
> - traverseMethodsWith(new MethodVerifier(listener));
> + traverseMethodsWith(new MethodVerifier(verifier, listener));
> }
>
> public int countBehaviours() {
> @@ -69,36 +75,36 @@
> }
>
> public BehaviourMethod[] getBehaviourMethods(){
> - Set<BehaviourMethod> set = new HashSet<BehaviourMethod>();
> + Set set = new HashSet();
> Method[] methods = getMethods(BEHAVIOUR_METHODS);
> for (int i = 0; i < methods.length; i++) {
> set.add(createBehaviourMethod(methods[i]));
> - }
> - return set.toArray(new BehaviourMethod[set.size()]);
> + }
> + return (BehaviourMethod[]) set.toArray(new BehaviourMethod[set.size()]);
> }
> -
> +
> public BehaviourMethod createBehaviourMethod(Method method) {
> return new BehaviourMethod(createInstance(), method);
> }
> -
> +
> private Method[] getMethods(Matcher methodFilter){
> - Set<Method> set = new HashSet<Method>();
> + Set set = new HashSet();
> Method[] classMethods = classToVerify.getMethods();
> for (int i = 0; i < classMethods.length; i++) {
> Method method = classMethods[i];
> if ( methodFilter.matches(method)) {
> set.add(method);
> }
> - }
> - return set.toArray(new Method[set.size()]);
> + }
> + return (Method[]) set.toArray(new Method[set.size()]);
> }
> -
> +
> private void traverseMethodsWith(MethodHandler
> methodHandler) {
> if (Behaviours.class.isAssignableFrom(classToVerify)) {
> Behaviours behaviours = (Behaviours) createInstance();
> Class[] nestedClasses = behaviours.getBehaviours();
> for (int i = 0; i < nestedClasses.length; i++) {
> - methodHandler.handleClass(new
> BehaviourClass(nestedClasses[i]));
> + methodHandler.handleClass(new
> BehaviourClass(nestedClasses[i], verifier));
> }
> }
> Method[] methods = getMethods(BEHAVIOUR_METHODS);
> @@ -129,10 +135,10 @@
> public Class classToVerify() {
> return classToVerify;
> }
> -
> +
> private static class MethodCounter implements MethodHandler {
> int total = 0;
> -
> +
> public void handleClass(BehaviourClass behaviourClass) {
> total += behaviourClass.countBehaviours();
> }
> @@ -144,5 +150,5 @@
> public int total() {
> return total;
> }
> - }
> + }
> }
>
>
> Modified:
> trunk/core/src/java/org/jbehave/core/behaviour/MethodVerifier.java
> (795 => 796) ---
> trunk/core/src/java/org/jbehave/core/behaviour/MethodVerifier.java
> 2007-09-07 05:19:51 UTC (rev 795)
> +++
> trunk/core/src/java/org/jbehave/core/behaviour/MethodVerifier.java
> 2007-09-07 06:42:17 UTC (rev 796)
> @@ -5,9 +5,11 @@
>
> class MethodVerifier implements MethodHandler {
>
> + private final BehaviourVerifier verifier;
> private final BehaviourListener listener;
>
> - public MethodVerifier(BehaviourListener listener) {
> + public MethodVerifier(BehaviourVerifier verifier,
> BehaviourListener listener) {
> + this.verifier = verifier;
> this.listener = listener;
> }
>
> @@ -16,8 +18,6 @@
> }
>
> public void handleMethod(BehaviourMethod behaviourMethod) {
> - listener.before(behaviourMethod);
> - behaviourMethod.verifyTo(listener);
> - listener.after(behaviourMethod);
> + verifier.verifyBehaviour(behaviourMethod);
> }
> }
>
>
> Modified: trunk/extensions/ant/ant.iml (795 => 796) ---
> trunk/extensions/ant/ant.iml 2007-09-07 05:19:51 UTC (rev 795)
> +++ trunk/extensions/ant/ant.iml 2007-09-07 06:42:17 UTC (rev 796)
> @@ -1,5 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<module relativePaths="true" type="JAVA_MODULE" version="4">
> +<module version="4" relativePaths="true" type="JAVA_MODULE">
> + <component name="ModuleRootManager" />
> <component name="NewModuleRootManager"
> inherit-compiler-output="false">
> <output url="file://$MODULE_DIR$/classes" />
> <exclude-output />
> @@ -13,7 +14,7 @@
> <orderEntry type="module-library">
> <library>
> <CLASSES>
> - <root
> url="jar://$MODULE_DIR$/../../lib/extensions/ant-1.7.0.jar!/"
> />
> + <root
> url="jar://$MODULE_DIR$/../../lib/extensions/ant-1.6.5.jar!/"
> />
> </CLASSES>
> <JAVADOC />
> <SOURCES />
>
>
> Modified: trunk/extensions/jmock/jmock-extension.iml (795 => 796) ---
> trunk/extensions/jmock/jmock-extension.iml 2007-09-07 05:19:51 UTC (rev 795)
> +++ trunk/extensions/jmock/jmock-extension.iml 2007-09-07 06:42:17 UTC (rev
> 796)
> @@ -1,5 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<module relativePaths="true" type="JAVA_MODULE" version="4">
> +<module version="4" relativePaths="true" type="JAVA_MODULE">
> + <component name="ModuleRootManager" />
> <component name="NewModuleRootManager"
> inherit-compiler-output="false">
> <output url="file://$MODULE_DIR$/classes" />
> <exclude-output />
>
>
> Modified: trunk/extensions/junit/junit-extension.iml (795 => 796) ---
> trunk/extensions/junit/junit-extension.iml 2007-09-07 05:19:51 UTC (rev 795)
> +++ trunk/extensions/junit/junit-extension.iml 2007-09-07 06:42:17 UTC (rev
> 796)
> @@ -1,5 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<module relativePaths="true" type="JAVA_MODULE" version="4">
> +<module version="4" relativePaths="true" type="JAVA_MODULE">
> + <component name="ModuleRootManager" />
> <component name="NewModuleRootManager"
> inherit-compiler-output="false">
> <output url="file://$MODULE_DIR$/classes" />
> <exclude-output />
>
>
> Modified: trunk/extensions/swing/swing-extension.iml (795 => 796) ---
> trunk/extensions/swing/swing-extension.iml 2007-09-07 05:19:51 UTC (rev 795)
> +++ trunk/extensions/swing/swing-extension.iml 2007-09-07 06:42:17 UTC (rev
> 796)
> @@ -1,5 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<module relativePaths="true" type="JAVA_MODULE" version="4">
> +<module version="4" relativePaths="true" type="JAVA_MODULE">
> + <component name="ModuleRootManager" />
> <component name="NewModuleRootManager"
> inherit-compiler-output="false">
> <output url="file://$MODULE_DIR$/classes" />
> <exclude-output />
>
>
> Modified: trunk/jbehave.ipr (795 => 796) --- trunk/jbehave.ipr 2007-09-07
> 05:19:51 UTC (rev 795)
> +++ trunk/jbehave.ipr 2007-09-07 06:42:17 UTC (rev 796)
> @@ -1,5 +1,5 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<project relativePaths="true" version="4">
> +<project version="4" relativePaths="true">
> <component name="AntConfiguration">
> <defaultAnt bundledAnt="true" />
> </component>
> @@ -11,20 +11,8 @@
> <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
> </component>
> <component name="CodeStyleSettingsManager">
> - <option name="PER_PROJECT_SETTINGS">
> - <value>
> - <ADDITIONAL_INDENT_OPTIONS fileType="js">
> - <option name="INDENT_SIZE" value="4" />
> - <option name="CONTINUATION_INDENT_SIZE" value="8" />
> - <option name="TAB_SIZE" value="4" />
> - <option name="USE_TAB_CHARACTER" value="false" />
> - <option name="SMART_TABS" value="false" />
> - <option name="LABEL_INDENT_SIZE" value="0" />
> - <option name="LABEL_INDENT_ABSOLUTE" value="false" />
> - </ADDITIONAL_INDENT_OPTIONS>
> - </value>
> - </option>
> - <option name="USE_PER_PROJECT_SETTINGS" value="true" />
> + <option name="PER_PROJECT_SETTINGS" />
> + <option name="USE_PER_PROJECT_SETTINGS" value="false" />
> </component>
> <component name="CompilerConfiguration">
> <option name="DEFAULT_COMPILER" value="Javac" />
> @@ -44,15 +32,13 @@
> <entry name="?*.dtd" />
> <entry name="?*.tld" />
> <entry name="*.dat" />
> - <entry name="*.template" />
> </wildcardResourcePatterns>
> </component>
> + <component name="DataSourceManagerImpl" />
> <component name="DependenciesAnalyzeManager">
> <option name="myForwardDirection" value="false" />
> </component>
> - <component name="DependencyValidationManager">
> - <option name="SKIP_IMPORT_STATEMENTS" value="false" />
> - </component>
> + <component name="DependencyValidationManager" />
> <component name="EclipseCompilerSettings">
> <option name="DEBUGGING_INFO" value="true" />
> <option name="GENERATE_NO_WARNINGS" value="true" />
> @@ -68,13 +54,14 @@
> <option name="MAXIMUM_HEAP_SIZE" value="128" />
> </component>
> <component name="EntryPointsManager">
> - <entry_points version="2.0" />
> + <entry_points />
> </component>
> <component name="ExportToHTMLSettings">
> <option name="PRINT_LINE_NUMBERS" value="false" />
> <option name="OPEN_IN_BROWSER" value="false" />
> <option name="OUTPUT_DIRECTORY" />
> </component>
> + <component name="GUI Designer component loader factory" />
> <component name="IdProvider"
> IDEtalkID="1CF49F888FEE3EBA7B941733894FDE44" />
> <component name="InspectionProjectProfileManager">
> <option name="PROJECT_PROFILE" value="Project Default" />
> @@ -84,9 +71,26 @@
> <profile version="1.0" is_locked="false">
> <option name="myName" value="Project Default" />
> <option name="myLocal" value="false" />
> + <used_levels>
> + <error>
> + <option name="myName" value="ERROR" />
> + <option name="myVal" value="200" />
> + </error>
> + <warning>
> + <option name="myName" value="WARNING" />
> + <option name="myVal" value="100" />
> + </warning>
> + <information>
> + <option name="myName" value="INFO" />
> + <option name="myVal" value="200" />
> + </information>
> + <server>
> + <option name="myName" value="SERVER PROBLEM" />
> + <option name="myVal" value="100" />
> + </server>
> + </used_levels>
> </profile>
> </profiles>
> - <list size="0" />
> </component>
> <component name="JavacSettings">
> <option name="DEBUGGING_INFO" value="true" />
> @@ -247,7 +251,6 @@
> </item>
> </group>
> </component>
> - <component name="ProjectFileVersion" converted="true" />
> <component name="ProjectModuleManager">
> <modules>
> <module
> fileurl="file://$PROJECT_DIR$/extensions/ant/ant.iml"
> filepath="$PROJECT_DIR$/extensions/ant/ant.iml" />
> @@ -259,7 +262,9 @@
> <module fileurl="file://$PROJECT_DIR$/website/website.iml"
> filepath="$PROJECT_DIR$/website/website.iml" />
> </modules>
> </component>
> - <component name="ProjectRootManager" version="2" assert-keyword="true"
> jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK" />
> + <component name="ProjectRootManager" version="2" assert-keyword="true"
> jdk-15="false" project-jdk-name="1.4" project-jdk-type="JavaSDK" />
> + <component name="ProjectRunConfigurationManager" />
> + <component name="RAILS_PROJECT_VIEW_PANE" />
> <component name="RUBY_DOC_SETTINGS">
> <RUBY_DOC NAME="DEFAULTS" VALUE="TRUE" />
> <RUBY_DOC NAME="NUMBER" VALUE="0" />
> @@ -271,15 +276,8 @@
> <option name="GENERATE_IIOP_STUBS" value="false" />
> <option name="ADDITIONAL_OPTIONS_STRING" value="" />
> </component>
> - <component name="VcsDirectoryMappings">
> - <mapping directory="" vcs="svn" />
> - <mapping directory="$PROJECT_DIR$/core" vcs="svn" />
> - <mapping directory="$PROJECT_DIR$/extensions/ant"
> vcs="svn" />
> - <mapping directory="$PROJECT_DIR$/extensions/jmock"
> vcs="svn" />
> - <mapping directory="$PROJECT_DIR$/extensions/junit"
> vcs="svn" />
> - <mapping directory="$PROJECT_DIR$/lib" vcs="svn" />
> - <mapping directory="$PROJECT_DIR$/website" vcs="svn" />
> - </component>
> + <component name="StarteamVcsAdapter" />
> + <component name="VssVcs" />
> <component
> name="com.intellij.jsf.UserDefinedFacesConfigs">
> <option name="USER_DEFINED_CONFIGS">
> <value>
> @@ -287,8 +285,12 @@
> </value>
> </option>
> </component>
> - <UsedPathMacros>
> - <macro name="IDEA_HOME" />
> - </UsedPathMacros>
> + <component name="libraryTable" />
> + <component name="uidesigner-configuration">
> + <option name="INSTRUMENT_CLASSES" value="true" />
> + <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true"
> />
> + <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
> + </component>
> + <UsedPathMacros />
> </project>
>
>
>
> Modified: trunk/lib/lib.iml (795 => 796) --- trunk/lib/lib.iml 2007-09-07
> 05:19:51 UTC (rev 795)
> +++ trunk/lib/lib.iml 2007-09-07 06:42:17 UTC (rev 796)
> @@ -1,5 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<module relativePaths="true" type="JAVA_MODULE" version="4">
> +<module version="4" relativePaths="true" type="JAVA_MODULE">
> + <component name="ModuleRootManager" />
> <component name="NewModuleRootManager"
> inherit-compiler-output="false">
> <output url="file://$MODULE_DIR$/classes" />
> <exclude-output />
> @@ -8,7 +9,7 @@
> </content>
> <orderEntry type="inheritedJdk" />
> <orderEntry type="sourceFolder" forTests="false" />
> - <orderEntry type="module-library" exported="">
> + <orderEntry type="module-library">
> <library>
> <CLASSES>
> <root
> url="jar://$MODULE_DIR$/extensions/velocity-dep-1.4.jar!/"
> />
> @@ -17,26 +18,16 @@
> <SOURCES />
> </library>
> </orderEntry>
> - <orderEntry type="module-library" exported="">
> + <orderEntry type="module" module-name="jbehave-core" />
> + <orderEntry type="module-library">
> <library>
> <CLASSES>
> - <root url="jar://$MODULE_DIR$/extensions/ant-1.7.0.jar!/"
> />
> + <root
> url="jar://$MODULE_DIR$/extensions/antlr-2.7.6.jar!/" />
> </CLASSES>
> <JAVADOC />
> <SOURCES />
> </library>
> </orderEntry>
> - <orderEntry type="module-library" exported="">
> - <library>
> - <CLASSES>
> - <root url="jar://$MODULE_DIR$/test/cotta.jar!/" />
> - </CLASSES>
> - <JAVADOC />
> - <SOURCES>
> - <root url="jar://$MODULE_DIR$/test/cotta-src.zip!/" />
> - </SOURCES>
> - </library>
> - </orderEntry>
> <orderEntryProperties />
> </component>
> <component name="VcsManagerConfiguration">
>
>
> Modified: trunk/website/website.iml (795 => 796) ---
> trunk/website/website.iml 2007-09-07 05:19:51 UTC (rev 795)
> +++ trunk/website/website.iml 2007-09-07 06:42:17 UTC (rev 796)
> @@ -1,5 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<module relativePaths="true" type="JAVA_MODULE" version="4">
> +<module version="4" relativePaths="true" type="JAVA_MODULE">
> + <component name="ModuleRootManager" />
> <component name="NewModuleRootManager"
> inherit-compiler-output="false">
> <output url="file://$MODULE_DIR$/classes" />
> <exclude-output />
>
>
> ________________________________
>
>
> To unsubscribe from this list please visit:
>
> http://xircles.codehaus.org/manage_email
--
Shane
http://www.shaneduan.com
---------------------------------------------------------------------
To unsubscribe from this list please visit:
http://xircles.codehaus.org/manage_email
