forked from mockito/mockito
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
These changes follows this PR mockito#219 commit 8e94fbf
- Loading branch information
Showing
20 changed files
with
1,465 additions
and
1,465 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <fileset-config file-format-version="1.2.0" simple-config="false"> | ||
| <local-check-config name="mockito-code" location="conf/checkstyle-code.xml" type="project" description=""> | ||
| <additional-data name="protect-config-file" value="false"/> | ||
| </local-check-config> | ||
| <local-check-config name="mockito-test" location="conf/checkstyle-test.xml" type="project" description=""> | ||
| <additional-data name="protect-config-file" value="false"/> | ||
| </local-check-config> | ||
| <fileset name="mockito-code" enabled="true" check-config-name="mockito-code" local="true"> | ||
| <file-match-pattern match-pattern="^src[/\\].*java$" include-pattern="true"/> | ||
| </fileset> | ||
| <fileset name="mockito-test" enabled="true" check-config-name="mockito-test" local="true"> | ||
| <file-match-pattern match-pattern="^test[/\\].*java$" include-pattern="true"/> | ||
| </fileset> | ||
| </fileset-config> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <fileset-config file-format-version="1.2.0" simple-config="false"> | ||
| <local-check-config name="mockito-code" location="conf/checkstyle-code.xml" type="project" description=""> | ||
| <additional-data name="protect-config-file" value="false"/> | ||
| </local-check-config> | ||
| <local-check-config name="mockito-test" location="conf/checkstyle-test.xml" type="project" description=""> | ||
| <additional-data name="protect-config-file" value="false"/> | ||
| </local-check-config> | ||
| <fileset name="mockito-code" enabled="true" check-config-name="mockito-code" local="true"> | ||
| <file-match-pattern match-pattern="^src[/\\].*java$" include-pattern="true"/> | ||
| </fileset> | ||
| <fileset name="mockito-test" enabled="true" check-config-name="mockito-test" local="true"> | ||
| <file-match-pattern match-pattern="^test[/\\].*java$" include-pattern="true"/> | ||
| </fileset> | ||
| </fileset-config> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> | ||
| <classpathentry kind="lib" path="lib/ant-1.7.0.jar"/> | ||
| <classpathentry kind="output" path="build-eclipse"/> | ||
| </classpath> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> | ||
| <classpathentry kind="lib" path="lib/ant-1.7.0.jar"/> | ||
| <classpathentry kind="output" path="build-eclipse"/> | ||
| </classpath> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>mockito-repackaged</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>mockito-repackaged</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| This mockito subproject repackages cglib + asm to avoid problems with conflicting versions. | ||
| Unfortunately, jarjar was not able to repackage sources | ||
| therefore I'm using this subproject to repackage cglib+asm. | ||
| This mockito subproject repackages cglib + asm to avoid problems with conflicting versions. | ||
|
|
||
| Unfortunately, jarjar was not able to repackage sources | ||
| therefore I'm using this subproject to repackage cglib+asm. | ||
| We should NEVER modify cglib/asm - sources are here only for the sake of repackaging. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,29 @@ | ||
| Copyright (c) 2000-2005 INRIA, France Telecom | ||
| All rights reserved. | ||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions | ||
| are met: | ||
| 1. Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
| 2. Redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in the | ||
| documentation and/or other materials provided with the distribution. | ||
| 3. Neither the name of the copyright holders nor the names of its | ||
| contributors may be used to endorse or promote products derived from | ||
| this software without specific prior written permission. | ||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| Copyright (c) 2000-2005 INRIA, France Telecom | ||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions | ||
| are met: | ||
|
|
||
| 1. Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
|
|
||
| 2. Redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in the | ||
| documentation and/or other materials provided with the distribution. | ||
|
|
||
| 3. Neither the name of the copyright holders nor the names of its | ||
| contributors may be used to endorse or promote products derived from | ||
| this software without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| THE POSSIBILITY OF SUCH DAMAGE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,28 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <module type="JAVA_MODULE" version="4"> | ||
| <component name="EclipseModuleManager"> | ||
| <libelement value="jar://$MODULE_DIR$/lib/ant-1.7.0.jar!/" /> | ||
| <src_description expected_position="0"> | ||
| <src_folder value="file://$MODULE_DIR$/src" expected_position="0" /> | ||
| </src_description> | ||
| </component> | ||
| <component name="NewModuleRootManager" inherit-compiler-output="false"> | ||
| <output url="file://$MODULE_DIR$/build-eclipse" /> | ||
| <exclude-output /> | ||
| <content url="file://$MODULE_DIR$"> | ||
| <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> | ||
| </content> | ||
| <orderEntry type="sourceFolder" forTests="false" /> | ||
| <orderEntry type="inheritedJdk" /> | ||
| <orderEntry type="module-library"> | ||
| <library name="ant-1.7.0.jar"> | ||
| <CLASSES> | ||
| <root url="jar://$MODULE_DIR$/lib/ant-1.7.0.jar!/" /> | ||
| </CLASSES> | ||
| <JAVADOC /> | ||
| <SOURCES /> | ||
| </library> | ||
| </orderEntry> | ||
| </component> | ||
| </module> | ||
|
|
||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <module type="JAVA_MODULE" version="4"> | ||
| <component name="EclipseModuleManager"> | ||
| <libelement value="jar://$MODULE_DIR$/lib/ant-1.7.0.jar!/" /> | ||
| <src_description expected_position="0"> | ||
| <src_folder value="file://$MODULE_DIR$/src" expected_position="0" /> | ||
| </src_description> | ||
| </component> | ||
| <component name="NewModuleRootManager" inherit-compiler-output="false"> | ||
| <output url="file://$MODULE_DIR$/build-eclipse" /> | ||
| <exclude-output /> | ||
| <content url="file://$MODULE_DIR$"> | ||
| <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> | ||
| </content> | ||
| <orderEntry type="sourceFolder" forTests="false" /> | ||
| <orderEntry type="inheritedJdk" /> | ||
| <orderEntry type="module-library"> | ||
| <library name="ant-1.7.0.jar"> | ||
| <CLASSES> | ||
| <root url="jar://$MODULE_DIR$/lib/ant-1.7.0.jar!/" /> | ||
| </CLASSES> | ||
| <JAVADOC /> | ||
| <SOURCES /> | ||
| </library> | ||
| </orderEntry> | ||
| </component> | ||
| </module> | ||
|
|
Oops, something went wrong.