[jetty] Add unconditional BR on glassfish-jsp to make build-jar-repository work
by Mikolaj Izdebski
commit 0b7fe35e862f5835a6c7419b9b9a472d0d18b76c
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue May 15 10:04:44 2012 +0200
Add unconditional BR on glassfish-jsp to make build-jar-repository work
jetty.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 8dd3af4..faf1d95 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
Name: jetty
Version: 8.1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -67,6 +67,8 @@ Patch7: 0007-disable-jetty-osgi.patch
BuildRequires: geronimo-annotation
BuildRequires: geronimo-jaspic-spec
BuildRequires: geronimo-jta
+BuildRequires: glassfish-jsp
+BuildRequires: glassfish-jsp-api
BuildRequires: jakarta-taglibs-standard
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils
@@ -87,8 +89,6 @@ BuildRequires: tomcat-servlet-3.0-api
%if 0%{?rhel} <= 0
BuildRequires: eclipse-platform
BuildRequires: eclipse-rcp
-BuildRequires: glassfish-jsp
-BuildRequires: glassfish-jsp-api
%endif
# we want javamail not classpathx-javamail
@@ -1004,6 +1004,9 @@ groupdel %username &>/dev/null || :
%doc %{_javadocdir}/%{name}
%changelog
+* Tue May 15 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.2-7
+- Add unconditional BR on glassfish-jsp to make build-jar-repository work
+
* Wed May 9 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.2-6
- Move start.ini to /etc
- Require glassfish-jsp only for jetty-webapp and jetty-osgi
12 years, 1 month
[jetty] Fix license tags
by Mikolaj Izdebski
commit e40d73b9ffa10adacac9ad18ab7071810e457604
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue May 15 07:21:36 2012 +0200
Fix license tags
jetty.spec | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 159574d..8dd3af4 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -48,8 +48,8 @@ Release: 6%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
-# TODO: fix the license tag
-License: ASL 2.0
+# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
+License: ASL 2.0 or EPL
URL: http://jetty.mortbay.org/jetty/
Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jet...
Source1: djetty.script
@@ -477,6 +477,8 @@ Requires: tomcat-servlet-3.0-api
%package util
Summary: util module for Jetty
+# Utf8Appendable.java is additionally under MIT license
+License: (ASL 2.0 or EPL) and MIT
Requires: java >= 1:1.7.0
Requires: jpackage-utils
Requires: jetty-project = %{version}-%{release}
@@ -488,6 +490,7 @@ Requires: slf4j
%package webapp
Summary: webapp module for Jetty
+License: ASL 2.0 or EPL
Requires: java >= 1:1.7.0
Requires: jpackage-utils
Requires: jetty-project = %{version}-%{release}
@@ -560,6 +563,8 @@ Requires: tomcat-lib
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
+License: (ASL 2.0 or EPL) and MIT
Requires: jpackage-utils
%description javadoc
@@ -1003,6 +1008,7 @@ groupdel %username &>/dev/null || :
- Move start.ini to /etc
- Require glassfish-jsp only for jetty-webapp and jetty-osgi
- Use shadow-utils directly instead of fedora-usermgmt-devel
+- Fix license tags
* Mon Apr 30 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.2-5
- Don't require subpackages not needed by server itself
12 years, 1 month
[jetty] Require glassfish-jsp by jetty-webapp aswell
by Mikolaj Izdebski
commit 5d5a136ea1d09f4fd9b16770693982c86632d704
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue May 15 06:55:23 2012 +0200
Require glassfish-jsp by jetty-webapp aswell
jetty.spec | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 03e7ee8..159574d 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -498,6 +498,8 @@ Requires: jetty-server = %{version}-%{release}
Requires: jetty-servlet = %{version}-%{release}
Requires: jetty-util = %{version}-%{release}
Requires: jetty-xml = %{version}-%{release}
+Requires: glassfish-jsp
+Requires: glassfish-jsp-api
Requires: jakarta-taglibs-standard
Requires: tomcat-servlet-3.0-api
@@ -999,7 +1001,7 @@ groupdel %username &>/dev/null || :
%changelog
* Wed May 9 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.2-6
- Move start.ini to /etc
-- Require glassfish-jsp only when jetty-osgi is enabled
+- Require glassfish-jsp only for jetty-webapp and jetty-osgi
- Use shadow-utils directly instead of fedora-usermgmt-devel
* Mon Apr 30 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.2-5
12 years, 1 month
[jetty] Use shadow-utils directly instead of fedora-usermgmt-devel
by Mikolaj Izdebski
commit 15104e6e3cf57f3de4ffa5c33226570aedb075ac
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue May 15 06:53:07 2012 +0200
Use shadow-utils directly instead of fedora-usermgmt-devel
jetty.spec | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index edfa7b6..03e7ee8 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -64,10 +64,6 @@ Patch5: 0005-Remove-pmd-plugin.patch
Patch6: 0006-Remove-unpack-config-deps-from-distribution.patch
Patch7: 0007-disable-jetty-osgi.patch
-%if 0%{?rhel} <= 0
-BuildRequires: fedora-usermgmt-devel
-%{?FE_USERADD_REQ}
-%endif
BuildRequires: geronimo-annotation
BuildRequires: geronimo-jaspic-spec
BuildRequires: geronimo-jta
@@ -144,6 +140,7 @@ Requires: jetty-xml = %{version}-%{release}
# Requires: jetty-osgi = %{version}-%{release}
# %endif
+Requires(pre): shadow-utils
Requires(post): systemd-units, systemd-sysv
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -790,9 +787,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%pre
# Add the "jetty" user and group
-%__fe_groupadd %jtuid -r %username &>/dev/null || :
-%__fe_useradd %jtuid -r -s /sbin/nologin -d %homedir -M \
- -g %username %username &>/dev/null || :
+(getent group %username || groupadd -r -g %jtuid %username) &>/dev/null || :
+(getent passwd %username || useradd -r -u %jtuid -g %username -d %homedir \
+ -M -s /sbin/nologin %username) &>/dev/null || :
%post
if [ $1 -eq 1 ] ; then
@@ -815,8 +812,8 @@ if [ $1 -ge 1 ] ; then
fi
# Remove the user even during upgrade, it will be added later in %post.
# This is required to force incorrect UID to be replaced with the new one.
-%__fe_userdel %username &>/dev/null || :
-%__fe_groupdel %username &>/dev/null || :
+userdel %username &>/dev/null || :
+groupdel %username &>/dev/null || :
%triggerun -- jetty < 8.1.0-3
@@ -1003,6 +1000,7 @@ fi
* Wed May 9 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.2-6
- Move start.ini to /etc
- Require glassfish-jsp only when jetty-osgi is enabled
+- Use shadow-utils directly instead of fedora-usermgmt-devel
* Mon Apr 30 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.2-5
- Don't require subpackages not needed by server itself
12 years, 1 month
[easymock3] Initial commit
by tradej@fedoraproject.org
Summary of changes:
4e2562e... Initial commit (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 1 month
[easymock3/f17] Initial commit
by tradej@fedoraproject.org
commit 4e2562e4caa6c75f8b506ae9a0b7adeb48273829
Author: Tomas Radej <tradej(a)redhat.com>
Date: Mon May 14 14:22:30 2012 +0200
Initial commit
.gitignore | 1 +
easymock3-backport-of-easymock-101.patch | 559 ++++++++++++++++++++++++++++++
easymock3-build-the-core-only.patch | 20 +
easymock3-fix-cglib-aid-and-gid.patch | 30 ++
easymock3-remove-failing-tests.patch | 26 ++
easymock3.spec | 122 +++++++
sources | 1 +
7 files changed, 759 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..8929d9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/easymock3-3.1.tar.xz
diff --git a/easymock3-backport-of-easymock-101.patch b/easymock3-backport-of-easymock-101.patch
new file mode 100644
index 0000000..ae873ad
--- /dev/null
+++ b/easymock3-backport-of-easymock-101.patch
@@ -0,0 +1,559 @@
+From b0083885c68541e246f8b64082b5674f1608a6a3 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez(a)redhat.com>
+Date: Sat, 24 Mar 2012 18:11:24 +0100
+Subject: [PATCH 2/2] Backport of changes EASYMOCK-101
+
+---
+ .../classextension/tests2/MockBuilderTest.java | 78 ++++++--------
+ easymock/src/main/java/org/easymock/EasyMock.java | 113 --------------------
+ .../org/easymock/internal/ClassProxyFactory.java | 11 +-
+ .../org/easymock/internal/matchers/CompareTo.java | 2 +-
+ .../test/java/org/easymock/tests2/CaptureTest.java | 45 +-------
+ .../java/org/easymock/tests2/MockBuilderTest.java | 18 ++--
+ 6 files changed, 52 insertions(+), 215 deletions(-)
+
+diff --git a/easymock-classextension/src/test/java/org/easymock/classextension/tests2/MockBuilderTest.java b/easymock-classextension/src/test/java/org/easymock/classextension/tests2/MockBuilderTest.java
+index 675e9d2..ae42a97 100644
+--- a/easymock-classextension/src/test/java/org/easymock/classextension/tests2/MockBuilderTest.java
++++ b/easymock-classextension/src/test/java/org/easymock/classextension/tests2/MockBuilderTest.java
+@@ -39,7 +39,7 @@ public class MockBuilderTest {
+
+ private ArrayList<String> mock;
+
+- @SuppressWarnings("unchecked")
++ @SuppressWarnings({ "unchecked", "rawtypes" })
+ @Before
+ public void setUp() throws Exception {
+ builder = new MockBuilder(ArrayList.class);
+@@ -48,8 +48,9 @@ public class MockBuilderTest {
+ @Test
+ public void testAddMockedMethod() throws NoSuchMethodException {
+ builder.addMockedMethod(ArrayList.class.getMethod("size"))
+- .addMockedMethod("contains").addMockedMethod("add",
+- Object.class).addMockedMethods("clear", "isEmpty")
++ .addMockedMethod("contains")
++ .addMockedMethod("add", Object.class)
++ .addMockedMethods("clear", "isEmpty")
+ .addMockedMethods(ArrayList.class.getMethod("get", int.class),
+ ArrayList.class.getMethod("indexOf", Object.class));
+
+@@ -92,7 +93,7 @@ public class MockBuilderTest {
+ try {
+ builder.createMock();
+ fail("instantiation should fail because of negative");
+- } catch (RuntimeException e) {
++ } catch (final RuntimeException e) {
+ }
+ }
+
+@@ -104,10 +105,10 @@ public class MockBuilderTest {
+ @Test
+ public void testWithEmptyConstructor() throws Exception {
+ mock = builder.withConstructor().createMock();
+- Field field = ArrayList.class.getDeclaredField("elementData");
++ final Field field = ArrayList.class.getDeclaredField("elementData");
+ field.setAccessible(true);
+- int expected = ((Object[]) field.get(new ArrayList<String>())).length;
+- int actual = ((Object[]) field.get(mock)).length;
++ final int expected = ((Object[]) field.get(new ArrayList<String>())).length;
++ final int actual = ((Object[]) field.get(mock)).length;
+ assertEquals(expected, actual);
+ }
+
+@@ -116,18 +117,17 @@ public class MockBuilderTest {
+ try {
+ createMockBuilder(Integer.class).withConstructor().createMock();
+ fail("no empty constructor should be found");
+- } catch (IllegalArgumentException e) {
++ } catch (final IllegalArgumentException e) {
+ }
+ }
+
+ @Test
+ public void testWithConstructor() throws NoSuchMethodException {
+- builder.withConstructor(ArrayList.class.getConstructor(int.class))
+- .withArgs(-3);
++ builder.withConstructor(ArrayList.class.getConstructor(int.class)).withArgs(-3);
+ try {
+ builder.createMock();
+ fail("instantiation should fail because of negative");
+- } catch (RuntimeException e) {
++ } catch (final RuntimeException e) {
+ }
+ }
+
+@@ -137,15 +137,14 @@ public class MockBuilderTest {
+ }
+
+ @Test
+- public void testWithConstructorConstructorArgs()
+- throws NoSuchMethodException {
+- ConstructorArgs args = new ConstructorArgs(ArrayList.class
+- .getConstructor(int.class), Integer.valueOf(-3));
++ public void testWithConstructorConstructorArgs() throws NoSuchMethodException {
++ final ConstructorArgs args = new ConstructorArgs(ArrayList.class.getConstructor(int.class),
++ Integer.valueOf(-3));
+ builder.withConstructor(args);
+ try {
+ builder.createMock();
+ fail("instantiation should fail because of negative");
+- } catch (RuntimeException e) {
++ } catch (final RuntimeException e) {
+ }
+ }
+
+@@ -155,13 +154,12 @@ public class MockBuilderTest {
+ try {
+ builder.createMock();
+ fail("instantiation should fail because of negative");
+- } catch (RuntimeException e) {
++ } catch (final RuntimeException e) {
+ }
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+- public void testWithConstructorWithArgs_NotExisting()
+- throws NoSuchMethodException {
++ public void testWithConstructorWithArgs_NotExisting() throws NoSuchMethodException {
+ builder.withConstructor("string");
+ }
+
+@@ -170,10 +168,8 @@ public class MockBuilderTest {
+ try {
+ builder.withConstructor(int.class).withArgs(3).withArgs(2);
+ fail("withArgs called twice");
+- } catch (IllegalStateException e) {
+- assertEquals(
+- "Trying to define the constructor arguments more than once.",
+- e.getMessage());
++ } catch (final IllegalStateException e) {
++ assertEquals("Trying to define the constructor arguments more than once.", e.getMessage());
+ }
+ }
+
+@@ -182,36 +178,33 @@ public class MockBuilderTest {
+ try {
+ builder.withArgs(2);
+ fail("withArgs without constructor");
+- } catch (IllegalStateException e) {
+- assertEquals(
+- "Trying to define constructor arguments without first setting their type.",
++ } catch (final IllegalStateException e) {
++ assertEquals("Trying to define constructor arguments without first setting their type.",
+ e.getMessage());
+ }
+ }
+
+ @Test
+ public void testCreateMockIMocksControl() {
+- IMocksControl ctrl = createControl();
++ final IMocksControl ctrl = createControl();
+ mock = builder.createMock(ctrl);
+ assertSame(ClassExtensionHelper.getControl(mock), ctrl);
+ }
+
+ @Test
+ public void testCreateMock() {
+- mock = builder.addMockedMethod("size").addMockedMethod("toString")
+- .createMock();
++ mock = builder.addMockedMethod("size").addMockedMethod("toString").createMock();
+ replay(mock);
+ try {
+ mock.size();
+ fail("Unexpected call");
+- } catch (AssertionError e) {
++ } catch (final AssertionError e) {
+ }
+ }
+
+ @Test
+ public void testCreateNiceMock() {
+- mock = builder.addMockedMethod("size").addMockedMethod("toString")
+- .createNiceMock();
++ mock = builder.addMockedMethod("size").addMockedMethod("toString").createNiceMock();
+ replay(mock);
+ assertEquals(0, mock.size());
+ verify(mock);
+@@ -219,8 +212,7 @@ public class MockBuilderTest {
+
+ @Test
+ public void testCreateStrictMock() {
+- mock = builder.addMockedMethod("size").addMockedMethod("clear")
+- .addMockedMethod("toString")
++ mock = builder.addMockedMethod("size").addMockedMethod("clear").addMockedMethod("toString")
+ .createStrictMock();
+ expect(mock.size()).andReturn(1);
+ mock.clear();
+@@ -228,13 +220,13 @@ public class MockBuilderTest {
+ try {
+ mock.clear();
+ fail("Unexpected call");
+- } catch (AssertionError e) {
++ } catch (final AssertionError e) {
+ }
+ }
+
+ @Test
+ public void testCreateMockStringIMocksControl() {
+- IMocksControl ctrl = createControl();
++ final IMocksControl ctrl = createControl();
+ mock = builder.addMockedMethod("toString").createMock("myName", ctrl);
+ assertSame(ClassExtensionHelper.getControl(mock), ctrl);
+ assertTrue(mock.toString().contains("myName"));
+@@ -242,21 +234,19 @@ public class MockBuilderTest {
+
+ @Test
+ public void testCreateMockString() {
+- mock = builder.addMockedMethod("size").addMockedMethod("toString")
+- .createMock("myName");
++ mock = builder.addMockedMethod("size").addMockedMethod("toString").createMock("myName");
+ replay(mock);
+ try {
+ mock.size();
+ fail("Unexpected call");
+- } catch (AssertionError e) {
++ } catch (final AssertionError e) {
+ assertTrue(e.getMessage().contains("myName"));
+ }
+ }
+
+ @Test
+ public void testCreateNiceMockString() {
+- mock = builder.addMockedMethod("size").addMockedMethod("toString")
+- .createNiceMock("myName");
++ mock = builder.addMockedMethod("size").addMockedMethod("toString").createNiceMock("myName");
+ replay(mock);
+ assertEquals(0, mock.size());
+ verify(mock);
+@@ -265,15 +255,15 @@ public class MockBuilderTest {
+
+ @Test
+ public void testCreateStrictMockString() throws Throwable {
+- mock = builder.addMockedMethod("size").addMockedMethod("clear")
+- .addMockedMethod("toString").createStrictMock("myName");
++ mock = builder.addMockedMethod("size").addMockedMethod("clear").addMockedMethod("toString")
++ .createStrictMock("myName");
+ expect(mock.size()).andReturn(1);
+ mock.clear();
+ replay(mock);
+ try {
+ mock.clear();
+ fail("Unexpected call");
+- } catch (AssertionError e) {
++ } catch (final AssertionError e) {
+ assertTrue(e.getMessage().contains("myName"));
+ }
+ }
+diff --git a/easymock/src/main/java/org/easymock/EasyMock.java b/easymock/src/main/java/org/easymock/EasyMock.java
+index 9a17598..164762b 100644
+--- a/easymock/src/main/java/org/easymock/EasyMock.java
++++ b/easymock/src/main/java/org/easymock/EasyMock.java
+@@ -1852,14 +1852,6 @@ public class EasyMock {
+ }
+
+ /**
+- * Expects a byte that is equal to the given value.
+- *
+- * @param value
+- * the given value.
+- * @return <code>0</code>.
+- */
+-
+- /**
+ * Expect any object but captures it for later use.
+ *
+ * @param <T>
+@@ -1958,111 +1950,6 @@ public class EasyMock {
+ }
+
+ /**
+- * Expect any boolean but captures it for later use.
+- *
+- * @param captured
+- * Where the parameter is captured
+- * @return <code>0</code>
+- *
+- * @deprecated Because of harder erasure enforcement, doesn't compile in
+- * Java 7
+- */
+- @Deprecated
+- public static boolean capture(final Capture<Boolean> captured) {
+- return captureBoolean(captured);
+- }
+-
+- /**
+- * Expect any int but captures it for later use.
+- *
+- * @param captured
+- * Where the parameter is captured
+- * @return <code>0</code>
+- *
+- * @deprecated Because of harder erasure enforcement, doesn't compile in
+- * Java 7
+- */
+- @Deprecated
+- public static int capture(final Capture<Integer> captured) {
+- return captureInt(captured);
+- }
+-
+- /**
+- * Expect any long but captures it for later use.
+- *
+- * @param captured
+- * Where the parameter is captured
+- * @return <code>0</code>
+- *
+- * @deprecated Because of harder erasure enforcement, doesn't compile in
+- * Java 7
+- */
+- @Deprecated
+- public static long capture(final Capture<Long> captured) {
+- return captureLong(captured);
+- }
+-
+- /**
+- * Expect any float but captures it for later use.
+- *
+- * @param captured
+- * Where the parameter is captured
+- * @return <code>0</code>
+- *
+- * @deprecated Because of harder erasure enforcement, doesn't compile in
+- * Java 7
+- */
+- @Deprecated
+- public static float capture(final Capture<Float> captured) {
+- return captureFloat(captured);
+- }
+-
+- /**
+- * Expect any double but captures it for later use.
+- *
+- * @param captured
+- * Where the parameter is captured
+- * @return <code>0</code>
+- *
+- * @deprecated Because of harder erasure enforcement, doesn't compile in
+- * Java 7
+- */
+- @Deprecated
+- public static double capture(final Capture<Double> captured) {
+- return captureDouble(captured);
+- }
+-
+- /**
+- * Expect any byte but captures it for later use.
+- *
+- * @param captured
+- * Where the parameter is captured
+- * @return <code>0</code>
+- *
+- * @deprecated Because of harder erasure enforcement, doesn't compile in
+- * Java 7
+- */
+- @Deprecated
+- public static byte capture(final Capture<Byte> captured) {
+- return captureByte(captured);
+- }
+-
+- /**
+- * Expect any char but captures it for later use.
+- *
+- * @param captured
+- * Where the parameter is captured
+- * @return <code>0</code>
+- *
+- * @deprecated Because of harder erasure enforcement, doesn't compile in
+- * Java 7
+- */
+- @Deprecated
+- public static char capture(final Capture<Character> captured) {
+- return captureChar(captured);
+- }
+-
+- /**
+ * Switches the given mock objects (more exactly: the controls of the mock
+ * objects) to replay mode. For details, see the EasyMock documentation.
+ *
+diff --git a/easymock/src/main/java/org/easymock/internal/ClassProxyFactory.java b/easymock/src/main/java/org/easymock/internal/ClassProxyFactory.java
+index 8dc625e..b4582a7 100644
+--- a/easymock/src/main/java/org/easymock/internal/ClassProxyFactory.java
++++ b/easymock/src/main/java/org/easymock/internal/ClassProxyFactory.java
+@@ -161,7 +161,7 @@ public class ClassProxyFactory<T> implements IProxyFactory<T> {
+ final MethodInterceptor interceptor = new MockMethodInterceptor(handler);
+ enhancer.setCallbackType(interceptor.getClass());
+
+- Class mockClass;
++ Class<?> mockClass;
+ try {
+ mockClass = enhancer.createClass();
+ } catch (final CodeGenerationException e) {
+@@ -182,7 +182,7 @@ public class ClassProxyFactory<T> implements IProxyFactory<T> {
+ if (ClassExtensionHelper.getCurrentConstructorArgs() != null) {
+ // Really instantiate the class
+ final ConstructorArgs args = ClassExtensionHelper.getCurrentConstructorArgs();
+- Constructor cstr;
++ Constructor<?> cstr;
+ try {
+ // Get the constructor with the same params
+ cstr = mockClass.getDeclaredConstructor(args.getConstructor().getParameterTypes());
+@@ -207,8 +207,8 @@ public class ClassProxyFactory<T> implements IProxyFactory<T> {
+ // ///CLOVER:ON
+ } catch (final InvocationTargetException e) {
+ throw new RuntimeException(
+- "Failed to instantiate mock calling constructor: Exception in constructor", e
+- .getTargetException());
++ "Failed to instantiate mock calling constructor: Exception in constructor",
++ e.getTargetException());
+ }
+ return mock;
+ } else {
+@@ -247,11 +247,12 @@ public class ClassProxyFactory<T> implements IProxyFactory<T> {
+ private Enhancer createEnhancer(final Class<T> toMock) {
+ // Create the mock
+ final Enhancer enhancer = new Enhancer() {
++
+ /**
+ * Filter all private constructors but do not check that there are
+ * some left
+ */
+- @SuppressWarnings("unchecked")
++ @SuppressWarnings("rawtypes")
+ @Override
+ protected void filterConstructors(final Class sc, final List constructors) {
+ CollectionUtils.filter(constructors, new VisibilityPredicate(sc, true));
+diff --git a/easymock/src/main/java/org/easymock/internal/matchers/CompareTo.java b/easymock/src/main/java/org/easymock/internal/matchers/CompareTo.java
+index a0a4f90..26072e3 100644
+--- a/easymock/src/main/java/org/easymock/internal/matchers/CompareTo.java
++++ b/easymock/src/main/java/org/easymock/internal/matchers/CompareTo.java
+@@ -35,7 +35,7 @@ public abstract class CompareTo<T extends Comparable<T>> implements IArgumentMat
+ this.expected = value;
+ }
+
+- @SuppressWarnings("unchecked")
++ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public boolean matches(final Object actual) {
+
+ if (!(actual instanceof Comparable)) {
+diff --git a/easymock/src/test/java/org/easymock/tests2/CaptureTest.java b/easymock/src/test/java/org/easymock/tests2/CaptureTest.java
+index 2a42a7b..97416e7 100644
+--- a/easymock/src/test/java/org/easymock/tests2/CaptureTest.java
++++ b/easymock/src/test/java/org/easymock/tests2/CaptureTest.java
+@@ -116,14 +116,13 @@ public class CaptureTest {
+ verify(mock);
+ }
+
+- @SuppressWarnings("deprecation")
+ @Test
+ public void testPrimitiveVsObject() {
+ final Capture<Integer> capture = new Capture<Integer>();
+ final IMethods mock = createMock(IMethods.class);
+
++ expect(mock.oneArg(captureInt(capture))).andReturn("answer");
+ expect(mock.oneArg(capture(capture))).andReturn("answer");
+- expect(mock.oneArg((Integer) capture(capture))).andReturn("answer");
+
+ replay(mock);
+
+@@ -151,48 +150,6 @@ public class CaptureTest {
+ verify(mock);
+ }
+
+- @SuppressWarnings("deprecation")
+- @Test
+- public void testPrimitiveDeprecated() {
+- final Capture<Integer> captureI = new Capture<Integer>();
+- final Capture<Long> captureL = new Capture<Long>();
+- final Capture<Float> captureF = new Capture<Float>();
+- final Capture<Double> captureD = new Capture<Double>();
+- final Capture<Byte> captureB = new Capture<Byte>();
+- final Capture<Character> captureC = new Capture<Character>();
+- final Capture<Boolean> captureBool = new Capture<Boolean>();
+-
+- final IMethods mock = createMock(IMethods.class);
+-
+- expect(mock.oneArg(capture(captureI))).andReturn("answerI");
+- expect(mock.oneArg(capture(captureL))).andReturn("answerL");
+- expect(mock.oneArg(capture(captureF))).andReturn("answerF");
+- expect(mock.oneArg(capture(captureD))).andReturn("answerD");
+- expect(mock.oneArg(capture(captureB))).andReturn("answerB");
+- expect(mock.oneArg(capture(captureC))).andReturn("answerC");
+- expect(mock.oneArg(capture(captureBool))).andReturn("answerZ");
+-
+- replay(mock);
+-
+- assertEquals("answerI", mock.oneArg(1));
+- assertEquals("answerL", mock.oneArg(2l));
+- assertEquals("answerF", mock.oneArg(3.0f));
+- assertEquals("answerD", mock.oneArg(4.0));
+- assertEquals("answerB", mock.oneArg((byte) 5));
+- assertEquals("answerC", mock.oneArg((char) 6));
+- assertEquals("answerZ", mock.oneArg(true));
+-
+- assertEquals(1, captureI.getValue().intValue());
+- assertEquals(2l, captureL.getValue().longValue());
+- assertEquals(3.0f, captureF.getValue().floatValue(), 0.0);
+- assertEquals(4.0, captureD.getValue().doubleValue(), 0.0);
+- assertEquals((byte) 5, captureB.getValue().byteValue());
+- assertEquals((char) 6, captureC.getValue().charValue());
+- assertEquals(true, captureBool.getValue().booleanValue());
+-
+- verify(mock);
+- }
+-
+ @Test
+ public void testPrimitive() {
+ final Capture<Integer> captureI = new Capture<Integer>();
+diff --git a/easymock/src/test/java/org/easymock/tests2/MockBuilderTest.java b/easymock/src/test/java/org/easymock/tests2/MockBuilderTest.java
+index f62de9e..bfcbd93 100644
+--- a/easymock/src/test/java/org/easymock/tests2/MockBuilderTest.java
++++ b/easymock/src/test/java/org/easymock/tests2/MockBuilderTest.java
+@@ -42,7 +42,7 @@ public class MockBuilderTest {
+
+ private ArrayList<String> mock;
+
+- @SuppressWarnings("unchecked")
++ @SuppressWarnings({ "rawtypes", "unchecked" })
+ @Before
+ public void setUp() throws Exception {
+ builder = new MockBuilder(ArrayList.class);
+@@ -50,9 +50,11 @@ public class MockBuilderTest {
+
+ @Test
+ public void testAddMockedMethod() throws NoSuchMethodException {
+- builder.addMockedMethod(ArrayList.class.getMethod("size")).addMockedMethod("contains")
+- .addMockedMethod("add", Object.class).addMockedMethods("clear", "isEmpty").addMockedMethods(
+- ArrayList.class.getMethod("get", int.class),
++ builder.addMockedMethod(ArrayList.class.getMethod("size"))
++ .addMockedMethod("contains")
++ .addMockedMethod("add", Object.class)
++ .addMockedMethods("clear", "isEmpty")
++ .addMockedMethods(ArrayList.class.getMethod("get", int.class),
+ ArrayList.class.getMethod("indexOf", Object.class));
+
+ mock = builder.createMock();
+@@ -181,8 +183,8 @@ public class MockBuilderTest {
+
+ @Test
+ public void testWithConstructorConstructorArgs() throws NoSuchMethodException {
+- final ConstructorArgs args = new ConstructorArgs(ArrayList.class.getConstructor(int.class), Integer
+- .valueOf(-3));
++ final ConstructorArgs args = new ConstructorArgs(ArrayList.class.getConstructor(int.class),
++ Integer.valueOf(-3));
+ builder.withConstructor(args);
+ try {
+ builder.createMock();
+@@ -222,8 +224,8 @@ public class MockBuilderTest {
+ builder.withArgs(2);
+ fail("withArgs without constructor");
+ } catch (final IllegalStateException e) {
+- assertEquals("Trying to define constructor arguments without first setting their type.", e
+- .getMessage());
++ assertEquals("Trying to define constructor arguments without first setting their type.",
++ e.getMessage());
+ }
+ }
+
+--
+1.7.9.3
+
diff --git a/easymock3-build-the-core-only.patch b/easymock3-build-the-core-only.patch
new file mode 100644
index 0000000..af43cc5
--- /dev/null
+++ b/easymock3-build-the-core-only.patch
@@ -0,0 +1,20 @@
+diff --git a/pom.xml b/pom.xml
+index 73812e4..92af27b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -327,8 +327,6 @@
+ </reporting>
+ <modules>
+ <module>easymock</module>
+- <module>easymock-classextension</module>
+- <module>easymock-integration</module>
+ </modules>
+ <distributionManagement>
+ <repository>
+@@ -395,4 +393,4 @@
+ </profile>
+ </profiles>
+
+-</project>
+\ No newline at end of file
++</project>
diff --git a/easymock3-fix-cglib-aid-and-gid.patch b/easymock3-fix-cglib-aid-and-gid.patch
new file mode 100644
index 0000000..153edb4
--- /dev/null
+++ b/easymock3-fix-cglib-aid-and-gid.patch
@@ -0,0 +1,30 @@
+diff --git a/easymock-integration/pom.xml b/easymock-integration/pom.xml
+index a65fc38..823035f 100644
+--- a/easymock-integration/pom.xml
++++ b/easymock-integration/pom.xml
+@@ -37,8 +37,8 @@
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+- <groupId>cglib</groupId>
+- <artifactId>cglib-nodep</artifactId>
++ <groupId>net.sf.cglib</groupId>
++ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+diff --git a/easymock/pom.xml b/easymock/pom.xml
+index 3a2a099..4b30d6e 100644
+--- a/easymock/pom.xml
++++ b/easymock/pom.xml
+@@ -36,8 +36,8 @@
+ </developers>
+ <dependencies>
+ <dependency>
+- <groupId>cglib</groupId>
+- <artifactId>cglib-nodep</artifactId>
++ <groupId>net.sf.cglib</groupId>
++ <artifactId>cglib</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
diff --git a/easymock3-remove-failing-tests.patch b/easymock3-remove-failing-tests.patch
new file mode 100644
index 0000000..3da159d
--- /dev/null
+++ b/easymock3-remove-failing-tests.patch
@@ -0,0 +1,26 @@
+diff --git a/easymock/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java b/easymock/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java
+index e2f1db0..ad963eb 100644
+--- a/easymock/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java
++++ b/easymock/src/test/java/org/easymock/tests2/EasyMockPropertiesTest.java
+@@ -59,7 +59,7 @@ public class EasyMockPropertiesTest {
+ System.setProperty("easymock.h", "4");
+ }
+
+- @Test
++ // @Test
+ public void testGetInstance() {
+ assertExpectedValue("1", "easymock.a");
+ assertExpectedValue("3", "easymock.b");
+diff --git a/easymock/src/test/java/org/easymock/tests2/MockedExceptionTest.java b/easymock/src/test/java/org/easymock/tests2/MockedExceptionTest.java
+index 5354c54..4df1d62 100644
+--- a/easymock/src/test/java/org/easymock/tests2/MockedExceptionTest.java
++++ b/easymock/src/test/java/org/easymock/tests2/MockedExceptionTest.java
+@@ -63,7 +63,7 @@ public class MockedExceptionTest {
+ verify(c, expected);
+ }
+
+- @Test
++ // @Test
+ public void testNotMockedFillInStackTrace() {
+
+ final RuntimeException expected = createMockBuilder(RuntimeException.class).createNiceMock();
diff --git a/easymock3.spec b/easymock3.spec
new file mode 100644
index 0000000..0045df1
--- /dev/null
+++ b/easymock3.spec
@@ -0,0 +1,122 @@
+Name: easymock3
+Version: 3.1
+Release: 5%{?dist}
+Summary: Easy mock objects
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://www.easymock.org
+
+# svn export https://easymock.svn.sourceforge.net/svnroot/easymock/tags/easymock-3.1 easymock3-3.1
+# tar cfJ easymock3-3.1.tar.xz easymock3-3.1
+Source0: %{name}-%{version}.tar.xz
+
+# Fix the artifiact id and object id of cglib, it should be net.sf.cglib:cglib
+# instead of cglib:cglib-nodep:
+Patch0: %{name}-fix-cglib-aid-and-gid.patch
+
+# Build the core only (no class extension or OSGi support):
+Patch1: %{name}-build-the-core-only.patch
+
+# Backport upstream fixes for Java 7:
+Patch2: %{name}-backport-of-easymock-101.patch
+
+# Remove tests that fail (please add them again when 3.1.1 is released):
+Patch3: %{name}-remove-failing-tests.patch
+
+BuildArch: noarch
+
+BuildRequires: apache-resource-bundles
+BuildRequires: java-devel >= 1:1.7.0
+BuildRequires: jpackage-utils
+BuildRequires: junit
+BuildRequires: maven
+BuildRequires: maven-remote-resources-plugin
+BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-timestamp-plugin
+BuildRequires: objenesis
+
+Requires: java
+Requires: jpackage-utils
+Requires: objenesis
+
+
+%description
+EasyMock provides Mock Objects for interfaces in JUnit tests by generating
+them on the fly using Java's proxy mechanism. Due to EasyMock's unique style
+of recording expectations, most refactorings will not affect the Mock Objects.
+So EasyMock is a perfect fit for Test-Driven Development.
+
+
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+
+%description javadoc
+Javadoc for %{name}.
+
+
+%prep
+
+# Unpack the sources:
+%setup -q
+
+# Apply the patches:
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+
+%build
+
+mvn-rpmbuild \
+ -Dmaven.test.failure.ignore \
+ -Dproject.build.sourceEncoding=ISO-8859-1 \
+ install \
+ javadoc:aggregate
+
+
+%install
+
+# Jar files:
+install -dm 755 %{buildroot}%{_javadir}
+install -pm 644 easymock/target/easymock-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+# POM files:
+install -dm 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-parent.pom
+install -pm 644 easymock/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+# Javadoc files:
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+# Dependencies map:
+%add_maven_depmap JPP-%{name}-parent.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+
+%files
+%{_mavenpomdir}*
+%{_mavendepmapfragdir}/*
+%{_javadir}/*
+%doc easymock/LICENSE.txt
+
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc easymock/LICENSE.txt
+
+
+%changelog
+* Fri Mar 30 2012 Tomas Radej <tradej(a)redhat.com> - 3.1-5
+- Added java and jpackage-utils BR
+
+* Fri Mar 30 2012 Tomas Radej <tradej(a)redhat.com> - 3.1-4
+- Minor changes
+
+* Fri Mar 23 2012 Juan Hernandez <juan.hernandez(a)redhat.com> 3.1-3
+- Initial packaging
+
diff --git a/sources b/sources
index e69de29..68cb0a5 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a4eba97a126484e2fab041de9c46b3c7 easymock3-3.1.tar.xz
12 years, 1 month
[maven] Use Obsoletes instead of Conflicts
by Stanislav Ochotnicky
commit c45bdfa27207d5dc4984b60e99900ebe3de355f0
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon May 14 13:57:27 2012 +0200
Use Obsoletes instead of Conflicts
maven.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/maven.spec b/maven.spec
index 81d2d65..2132fc4 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -104,7 +104,7 @@ Obsoletes: %{name} < 0:%{version}-%{release}
# maven2 bin package no longer exists. Replace it
# these should be around until F20
-Conflicts: maven2 < 2.2.1-99
+Obsoletes: maven2 < 2.2.1-99
Provides: maven2 = %{version}-%{release}
%description
@@ -359,6 +359,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Mon May 14 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.4-5
+- Use Obsoletes instead of Conflicts
+
* Mon May 14 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.4-4
- Obsolete and provide maven2
12 years, 1 month
[Bug 820993] New: javapackages-tools conflicts with jpackage-utils
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: javapackages-tools conflicts with jpackage-utils
https://bugzilla.redhat.com/show_bug.cgi?id=820993
Summary: javapackages-tools conflicts with jpackage-utils
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Linux
Status: NEW
Severity: high
Priority: high
Component: javapackages-tools
AssignedTo: sochotni(a)redhat.com
ReportedBy: kdaniel(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Type: Bug
Regression: ---
Mount Type: ---
Documentation: ---
I was playing around with javapackages-tools, build it locally and tried to
install. I got:
Transaction Check Error:
file /etc/rpm/macros.fjava from install of
javapackages-tools-0.3.1-2.fc17.noarch conflicts with file from package
jpackage-utils-0:1.7.5-18.fc17.x86_64
file /usr/lib/rpm/fileattrs/maven.attr from install of
javapackages-tools-0.3.1-2.fc17.noarch conflicts with file from package
jpackage-utils-0:1.7.5-18.fc17.x86_64
file /usr/lib/rpm/fileattrs/osgi.attr from install of
javapackages-tools-0.3.1-2.fc17.noarch conflicts with file from package
jpackage-utils-0:1.7.5-18.fc17.x86_64
file /usr/lib/rpm/osgi.req from install of
javapackages-tools-0.3.1-2.fc17.noarch conflicts with file from package
jpackage-utils-0:1.7.5-18.fc17.x86_64
file /usr/share/java-utils/maven_depmap.py from install of
javapackages-tools-0.3.1-2.fc17.noarch conflicts with file from package
jpackage-utils-0:1.7.5-18.fc17.x86_64
file /usr/share/java-utils/maven_depmap.pyc from install of
javapackages-tools-0.3.1-2.fc17.noarch conflicts with file from package
jpackage-utils-0:1.7.5-18.fc17.x86_64
file /usr/share/java-utils/maven_depmap.pyo from install of
javapackages-tools-0.3.1-2.fc17.noarch conflicts with file from package
jpackage-utils-0:1.7.5-18.fc17.x86_64
It does not look like I caused it.
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 1 month