[jsonic] Initial import (#1005800).
by gil
commit a7baa70e4afb48af8947f0aecfdffea147dc8f8b
Author: gil <puntogil(a)libero.it>
Date: Wed Dec 4 18:39:55 2013 +0100
Initial import (#1005800).
jsonic.spec | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/jsonic.spec b/jsonic.spec
index d7cd7ab..dd830ce 100644
--- a/jsonic.spec
+++ b/jsonic.spec
@@ -21,7 +21,8 @@ BuildRequires: mvn(org.springframework:spring-context)
BuildRequires: mvn(org.springframework:spring-core)
BuildRequires: mvn(org.springframework:spring-web)
BuildRequires: mvn(org.sonatype.sisu:sisu-guice)
-BuildRequires: mvn(org.sonatype.sisu.inject:guice-extensions)
+#BuildRequires: mvn(org.sonatype.sisu.inject:guice-extensions)
+BuildRequires: mvn(org.sonatype.sisu.inject:extensions-parent)
BuildRequires: mvn(org.sonatype.sisu.inject:guice-servlet)
BuildRequires: maven-local
10 years, 5 months
[jsonic] Initial import (#1005800).
by gil
commit 0b2ef808ef8cfd02d2aedcd60fa6ef1262da5b14
Author: gil <puntogil(a)libero.it>
Date: Wed Dec 4 18:23:58 2013 +0100
Initial import (#1005800).
.gitignore | 1 +
jsonic-1.3.0-pom.patch | 119 ++++++++++++++++++++++++++++++++++++++++++++++++
jsonic.spec | 76 ++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 197 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..8eaac5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jsonic-1.3.0.zip
diff --git a/jsonic-1.3.0-pom.patch b/jsonic-1.3.0-pom.patch
new file mode 100644
index 0000000..369e2e9
--- /dev/null
+++ b/jsonic-1.3.0-pom.patch
@@ -0,0 +1,119 @@
+--- pom.xml 2012-08-04 17:05:46.000000000 +0200
++++ pom.xml-gil 2013-09-03 05:11:08.721322431 +0200
+@@ -37,28 +37,104 @@
+ </repositories>
+ <dependencies>
+ <dependency>
+- <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
+- <version>[2.4,)</version>
++ <groupId>org.apache.commons</groupId>
++ <artifactId>commons-logging</artifactId>
++ <version>1.1.2</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.tomcat</groupId>
++ <artifactId>tomcat-servlet-api</artifactId>
++ <version>7.0.42</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+- <artifactId>spring</artifactId>
+- <version>[2.5,3)</version>
++ <artifactId>spring-beans</artifactId>
++ <version>3.1.1.RELEASE</version>
++ <optional>true</optional>
++ </dependency>
++ <dependency>
++ <groupId>org.springframework</groupId>
++ <artifactId>spring-context</artifactId>
++ <version>3.1.1.RELEASE</version>
++ <optional>true</optional>
++ </dependency>
++ <dependency>
++ <groupId>org.springframework</groupId>
++ <artifactId>spring-core</artifactId>
++ <version>3.1.1.RELEASE</version>
++ <optional>true</optional>
++ </dependency>
++ <dependency>
++ <groupId>org.springframework</groupId>
++ <artifactId>spring-web</artifactId>
++ <version>3.1.1.RELEASE</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+- <groupId>com.google.inject</groupId>
+- <artifactId>guice</artifactId>
+- <version>[2.0,)</version>
++ <groupId>org.sonatype.sisu</groupId>
++ <artifactId>sisu-guice</artifactId>
++ <version>3.1.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+- <groupId>org.seasar.container</groupId>
+- <artifactId>s2-framework</artifactId>
+- <version>[2.4,2.5)</version>
++ <groupId>org.sonatype.sisu.inject</groupId>
++ <artifactId>guice-servlet</artifactId>
++ <version>3.1.3</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
++ <properties>
++ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
++ </properties>
++ <build>
++
++ <directory>target</directory>
++ <sourceDirectory>src/java</sourceDirectory>
++ <outputDirectory>target/classes</outputDirectory>
++ <resources>
++ <resource>
++ <directory>src/java</directory>
++ <excludes>
++ <exclude>**/*.java</exclude>
++ </excludes>
++ </resource>
++ </resources>
++
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <version>3.0</version>
++ <executions>
++ <execution>
++ <id>default-compile</id>
++ <phase>compile</phase>
++ <configuration>
++ <excludes>
++ <exclude>**/S2Container.*</exclude>
++ </excludes>
++ </configuration>
++ <goals>
++ <goal>compile</goal>
++ </goals>
++ </execution>
++ </executions>
++ <configuration>
++ <source>1.6</source>
++ <target>1.6</target>
++ </configuration>
++ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-javadoc-plugin</artifactId>
++ <version>2.9.1</version>
++ <configuration>
++ <doctitle>${project.name} ${project.version}</doctitle>
++ <windowtitle>Copyright © 2007 Hidekatsu Izuno. All rights reserved</windowtitle>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
++
+ </project>
+\ Manca newline alla fine del file
diff --git a/jsonic.spec b/jsonic.spec
new file mode 100644
index 0000000..d7cd7ab
--- /dev/null
+++ b/jsonic.spec
@@ -0,0 +1,76 @@
+Name: jsonic
+Version: 1.3.0
+Release: 2%{?dist}
+Summary: Simple JSON encoder/decoder for Java
+License: ASL 2.0
+URL: http://jsonic.sourceforge.jp/
+Source0: http://jaist.dl.sourceforge.jp/%{name}/56583/%{name}-%{version}.zip
+# fix maven compiler-plugin configuration
+# fix encoding
+# fix build deps
+# disable unavailable org.seasar.container:s2-framework support
+# https://www.seasar.org/svn/s2container/
+Patch0: %{name}-%{version}-pom.patch
+
+BuildRequires: java-devel
+
+BuildRequires: mvn(org.apache.commons:commons-logging)
+BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
+BuildRequires: mvn(org.springframework:spring-beans)
+BuildRequires: mvn(org.springframework:spring-context)
+BuildRequires: mvn(org.springframework:spring-core)
+BuildRequires: mvn(org.springframework:spring-web)
+BuildRequires: mvn(org.sonatype.sisu:sisu-guice)
+BuildRequires: mvn(org.sonatype.sisu.inject:guice-extensions)
+BuildRequires: mvn(org.sonatype.sisu.inject:guice-servlet)
+
+BuildRequires: maven-local
+
+BuildArch: noarch
+
+%description
+Jsonic is a JSON encoding/decoding library for Java implementing RFC 4627
+(The application/JSON Media Type for JavaScript Object Notation).
+Encoding/decoding of primitive types and full Java objects is supported.
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q
+# cleanup
+find -name "*.class" -print -delete
+find -name "*.jar" -print -delete
+rm -r docs/*
+
+%patch0 -p0
+
+sed -i 's/\r//' LICENSE.txt
+
+# Remove javadoc warning
+# rm -r src/java/net/arnx/jsonic/web/extension/S2Container.java
+
+%build
+
+# No tests to run
+%mvn_file : %{name}
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%doc LICENSE.txt
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt
+
+%changelog
+* Wed Dec 04 2013 gil cattaneo <puntogil(a)libero.it> 1.3.0-2
+- used suggested description (1005800#c3)
+
+* Wed Jan 30 2013 gil cattaneo <puntogil(a)libero.it> 1.3.0-1
+- initial rpm
\ No newline at end of file
diff --git a/sources b/sources
index e69de29..bcc66c1 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+daf207c0c89c809920b21eff738256c6 jsonic-1.3.0.zip
10 years, 5 months
[Bug 1023116] Add support for absolute paths for artifact symlinks
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1023116
Mikolaj Izdebski <mizdebsk(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Keywords| |VerifiedUpstream
--- Comment #11 from Mikolaj Izdebski <mizdebsk(a)redhat.com> ---
Verified upstream.
I've rebuilt maven-downloader and added
%mvn_file : /foo /dummy/file %{name} /usr/share/java/bar/baz
the results are as below:
$ rpm -q xmvn
xmvn-1.4.0-0.7.git1777a06.noarch
$ rpm -ql maven-downloader
/dummy/file.jar
/foo.jar
/usr/share/doc/maven-downloader
/usr/share/doc/maven-downloader/LICENSE.txt
/usr/share/java/bar/baz.jar
/usr/share/java/maven-downloader.jar
/usr/share/maven-effective-poms/JPP-maven-downloader.pom
/usr/share/maven-fragments/maven-downloader.xml
/usr/share/maven-poms/JPP-maven-downloader.pom
$ ls -go /dummy/file.jar /foo.jar /usr/share/java/bar/baz.jar
/usr/share/java/maven-downloader.jar
lrwxrwxrwx. 1 38 Dec 4 18:07 /dummy/file.jar ->
../usr/share/java/maven-downloader.jar
lrwxrwxrwx. 1 35 Dec 4 18:07 /foo.jar ->
usr/share/java/maven-downloader.jar
lrwxrwxrwx. 1 23 Dec 4 18:07 /usr/share/java/bar/baz.jar ->
../maven-downloader.jar
-rw-r--r--. 1 16192 Dec 4 18:03 /usr/share/java/maven-downloader.jar
Everything seems correct to me.
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=nROxTJYpU9&a=cc_unsubscribe
10 years, 5 months
[javapackages] Revert "mvn_file: add support for absolute paths"
by Stanislav Ochotnicky
commit 7454e28ccca7b382e1a17dc1fb6fee475c1d4809
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Dec 4 17:47:06 2013 +0100
Revert "mvn_file: add support for absolute paths"
This reverts commit 9f136591a37fc5d2ba53d36379a1b9bb1d9c7298.
java-utils/mvn_file.py | 6 +-----
python/javapackages/xmvn_config.py | 5 +----
2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/java-utils/mvn_file.py b/java-utils/mvn_file.py
index e059129..e0a5142 100644
--- a/java-utils/mvn_file.py
+++ b/java-utils/mvn_file.py
@@ -61,10 +61,6 @@ commons-lang:commons-lang:war:test-jar:3.1
if __name__ == "__main__":
parser = SaneParser(usage=usage,
epilog=epilog)
- parser.add_option("-p", "--prefix",
- help="Set prefix for converting absolute paths to "+
- "relative",
- default="/usr/share/java")
for index, arg in enumerate(sys.argv):
sys.argv[index] = arg.decode(sys.getfilesystemencoding())
@@ -75,7 +71,7 @@ if __name__ == "__main__":
try:
orig = Artifact.from_mvn_str(args[0])
orig.validate(allow_backref=False)
- XMvnConfig().add_file_mapping(orig, args[1:], options.prefix)
+ XMvnConfig().add_file_mapping(orig, args[1:])
except (ArtifactValidationException, ArtifactFormatException), e:
parser.error("{e}: Provided artifact strings were invalid. "
"Please see help and check your arguments".format(e=e))
diff --git a/python/javapackages/xmvn_config.py b/python/javapackages/xmvn_config.py
index 838bde9..e28e340 100644
--- a/python/javapackages/xmvn_config.py
+++ b/python/javapackages/xmvn_config.py
@@ -205,7 +205,7 @@ class XMvnConfig(object):
elems.append(velem)
self.__add_config("artifactManagement", "rule", content=elems)
- def add_file_mapping(self, artifact, paths, prefix="/"):
+ def add_file_mapping(self, artifact, paths):
"""
Change where on filesystem given artifact is installed
@@ -224,9 +224,6 @@ class XMvnConfig(object):
"is higher than wildcard "
"groups.")
pe = SubElement(felem, "file")
-
- if os.path.isabs(path):
- path = os.path.relpath(path, prefix)
pe.text = path
elems.append(felem)
self.__add_config("artifactManagement", "rule", content=elems)
10 years, 5 months
[Bug 1023116] Add support for absolute paths for artifact symlinks
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1023116
Mikolaj Izdebski <mizdebsk(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Keywords|Reopened |Upstream
Assignee|sochotni(a)redhat.com |mizdebsk(a)redhat.com
--- Comment #10 from Mikolaj Izdebski <mizdebsk(a)redhat.com> ---
limited support for absolute JPP artifact files was implemented
in upstream commit af51da3. Anything more powerfull would be too
complicated and it's probably not worth the effort.
Artifact files specified as absolute paths pointing to arbitrary
locations are now allowed. They are implemented as symbolic links
which are pointing to the primary artifact file, which must be
explicitly specified as non-absolute file.
Appropriate suffixes are added depending on artifact version,
classifier and extension. As absolute symlinks can be placed at any
location, configured repositories are not taken into account and flat
repository layout is always assumed.
Absolute symlinks are only created for artifact files and attached
artifacts, but not for POM files. Absolute files for artifacts with
no files (i.e. POM artifacts) are silently ignored.
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=T8qdOjH6iY&a=cc_unsubscribe
10 years, 5 months
[Bug 1023116] Add support for absolute paths for artifact symlinks
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1023116
Stanislav Ochotnicky <sochotni(a)redhat.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Keywords| |NeedsTestCase
Summary|xmvn_file seems to be |Add support for absolute
|installing the symlink in |paths for artifact symlinks
|the wrong location |
--- Comment #9 from Stanislav Ochotnicky <sochotni(a)redhat.com> ---
OK, so after talking to Mikolaj a bit we decided to switch this back to XMvn.
Reasoning:
1. XMvn currently doesn't support absolute paths for file symlinks. This is due
to the fact that XMvn handles these symlinks as complete artifacts (symlinking
even pom.xml and versioned alternatives automatically) and artifacts have to be
in *some* repository. We have repositories for _javadir and few other
directories but that won't help with absolute paths
2. javapackages-tools can't properly decide what relative paths to give to XMvn
because it doesn't know where the first file will end up (since XMvn decides
based on configuration). It could be _javadir or _jnidir or something
completely else. You *can* currently override with -p switch for mvn_file but
that means packager has to know where the file ends up before creating the
package and ... it gets confusing fast
All that said Mikolaj is now working on a proper fix in XMvn itself so that
absolute symlinks are possible.
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=OTQrgUbURt&a=cc_unsubscribe
10 years, 5 months
[objectweb-pom] Initial packaging
by Mikolaj Izdebski
commit 4100c527841ffb3d68815f88ec5ce5ae4c9fa181
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Dec 4 15:04:27 2013 +0100
Initial packaging
.gitignore | 2 ++
objectweb-pom.spec | 33 +++++++++++++++++++++++++++++++++
sources | 2 ++
3 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..1a96c9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/LICENSE-2.0.txt
+/ow2-1.5.pom
diff --git a/objectweb-pom.spec b/objectweb-pom.spec
new file mode 100644
index 0000000..179f3f8
--- /dev/null
+++ b/objectweb-pom.spec
@@ -0,0 +1,33 @@
+Name: objectweb-pom
+Version: 1.5
+Release: 1%{?dist}
+Summary: Objectweb POM
+BuildArch: noarch
+License: ASL 2.0
+URL: http://gitorious.ow2.org/ow2/pom/
+Source0: http://repo.maven.apache.org/maven2/org/ow2/ow2/%{version}/ow2-%{version}...
+Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
+
+BuildRequires: maven-local
+BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+
+%description
+This package provides Objectweb parent POM used by different
+Objectweb packages.
+
+%prep
+cp -p %{SOURCE0} pom.xml
+cp -p %{SOURCE1} LICENSE
+
+%build
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%doc LICENSE
+
+%changelog
+* Tue Dec 3 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.5-1
+- Initial packaging
diff --git a/sources b/sources
index e69de29..a9e90ea 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,2 @@
+3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
+953e28ee26ab63e906546ca3a957f7ed ow2-1.5.pom
10 years, 5 months