Juan Hernandez has uploaded a new change for review. Change subject: packaging: Remove overriden JBoss modules ......................................................................
packaging: Remove overriden JBoss modules Remove some of the JBoss modules that we replaced in the past. They are no longer needed because the latest version of the JBoss package already includes them. Change-Id: I6c4ece73cb8400d6e51d70cb8ae34a309675bfbc Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> --- D deployment/modules/javax/ws/rs/api/main/module.xml D deployment/modules/org/apache/commons/codec/main/module.xml D deployment/modules/org/apache/httpcomponents/main/module.xml D deployment/modules/org/hibernate/validator/main/module.xml D deployment/modules/org/jboss/resteasy/resteasy-atom-provider/main/module.xml D deployment/modules/org/jboss/resteasy/resteasy-cdi/main/module.xml D deployment/modules/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml D deployment/modules/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml D deployment/modules/org/jboss/resteasy/resteasy-jaxrs/main/module.xml D deployment/modules/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml D deployment/modules/org/jboss/resteasy/resteasy-jsapi/main/module.xml D deployment/modules/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml D deployment/modules/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml D deployment/modules/org/scannotation/scannotation/main/module.xml M packaging/fedora/spec/ovirt-engine.spec.in 15 files changed, 1 insertion(+), 621 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/9402/1 diff --git a/deployment/modules/javax/ws/rs/api/main/module.xml b/deployment/modules/javax/ws/rs/api/main/module.xml deleted file mode 100644 index 5d23987..0000000 --- a/deployment/modules/javax/ws/rs/api/main/module.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="javax.ws.rs.api"> - <resources> - <resource-root path="jaxrs-api.jar"/> - </resources> - - <dependencies> - <module name="org.jboss.resteasy.resteasy-jaxrs" services="export"/> - </dependencies> -</module> diff --git a/deployment/modules/org/apache/commons/codec/main/module.xml b/deployment/modules/org/apache/commons/codec/main/module.xml deleted file mode 100644 index 7013941..0000000 --- a/deployment/modules/org/apache/commons/codec/main/module.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2011, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.apache.commons.codec"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="commons-codec.jar"/> - </resources> - - <dependencies> - </dependencies> -</module> diff --git a/deployment/modules/org/apache/httpcomponents/main/module.xml b/deployment/modules/org/apache/httpcomponents/main/module.xml deleted file mode 100644 index 20dfea9..0000000 --- a/deployment/modules/org/apache/httpcomponents/main/module.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2011, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.apache.httpcomponents"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="httpclient.jar"/> - <resource-root path="httpcore.jar"/> - <resource-root path="httpmime.jar"/> - </resources> - - <dependencies> - <module name="javax.api"/> - <module name="org.apache.commons.codec"/> - <module name="org.apache.commons.logging"/> - <module name="org.apache.james.mime4j"/> - </dependencies> -</module> diff --git a/deployment/modules/org/hibernate/validator/main/module.xml b/deployment/modules/org/hibernate/validator/main/module.xml deleted file mode 100644 index 31ce169..0000000 --- a/deployment/modules/org/hibernate/validator/main/module.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.hibernate.validator"> - <resources> - <resource-root path="hibernate-validator.jar"/> - <resource-root path="jtype.jar"/> - </resources> - - <dependencies> - <module name="javax.api"/> - <module name="javax.persistence.api"/> - <module name="javax.validation.api"/> - <module name="javax.persistence.api"/> - <module name="javax.xml.bind.api"/> - <module name="org.jboss.logging"/> - <module name="org.jboss.common-core"/> - <module name="org.joda.time"/> - <module name="org.slf4j"/> - <module name="org.apache.xerces" services="import"/> - <module name="sun.jdk" services="import"/> - </dependencies> -</module> diff --git a/deployment/modules/org/jboss/resteasy/resteasy-atom-provider/main/module.xml b/deployment/modules/org/jboss/resteasy/resteasy-atom-provider/main/module.xml deleted file mode 100644 index 173a695..0000000 --- a/deployment/modules/org/jboss/resteasy/resteasy-atom-provider/main/module.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.jboss.resteasy.resteasy-atom-provider"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="resteasy-atom-provider.jar"/> - </resources> - - <dependencies> - <module name="com.sun.xml.bind"/> - <module name="javax.xml.bind.api"/> - <module name="javax.api"/> - <module name="javax.enterprise.api"/> - <module name="javax.servlet.api"/> - <module name="javax.ws.rs.api"/> - <module name="org.jboss.resteasy.resteasy-jaxrs"/> - <module name="org.jboss.resteasy.resteasy-jaxb-provider"/> - </dependencies> -</module> diff --git a/deployment/modules/org/jboss/resteasy/resteasy-cdi/main/module.xml b/deployment/modules/org/jboss/resteasy/resteasy-cdi/main/module.xml deleted file mode 100644 index ace3859..0000000 --- a/deployment/modules/org/jboss/resteasy/resteasy-cdi/main/module.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.jboss.resteasy.resteasy-cdi"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="resteasy-cdi.jar"/> - </resources> - - <dependencies> - <module name="javax.api"/> - <module name="javax.enterprise.api"/> - <module name="javax.servlet.api"/> - <module name="javax.ws.rs.api"/> - <module name="org.jboss.resteasy.resteasy-jaxrs"/> - </dependencies> -</module> diff --git a/deployment/modules/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml b/deployment/modules/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml deleted file mode 100644 index ff49002..0000000 --- a/deployment/modules/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.jboss.resteasy.resteasy-jackson-provider"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="resteasy-jackson-provider.jar"/> - </resources> - - <dependencies> - <module name="org.codehaus.jackson.jackson-core-asl"/> - <module name="org.codehaus.jackson.jackson-jaxrs"/> - <module name="org.codehaus.jackson.jackson-mapper-asl"/> - <module name="org.codehaus.jackson.jackson-xc"/> - <module name="javax.xml.bind.api"/> - <module name="javax.api"/> - <module name="javax.enterprise.api"/> - <module name="javax.servlet.api"/> - <module name="javax.ws.rs.api"/> - <module name="org.jboss.resteasy.resteasy-jaxrs"/> - </dependencies> -</module> diff --git a/deployment/modules/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml b/deployment/modules/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml deleted file mode 100644 index cf6903a..0000000 --- a/deployment/modules/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.jboss.resteasy.resteasy-jaxb-provider"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="resteasy-jaxb-provider.jar"/> - </resources> - - <dependencies> - <module name="com.sun.xml.bind"/> - <module name="javax.xml.bind.api"/> - <module name="javax.api"/> - <module name="javax.enterprise.api"/> - <module name="javax.servlet.api"/> - <module name="javax.ws.rs.api"/> - <module name="org.jboss.resteasy.resteasy-jaxrs"/> - </dependencies> -</module> diff --git a/deployment/modules/org/jboss/resteasy/resteasy-jaxrs/main/module.xml b/deployment/modules/org/jboss/resteasy/resteasy-jaxrs/main/module.xml deleted file mode 100644 index 8add312..0000000 --- a/deployment/modules/org/jboss/resteasy/resteasy-jaxrs/main/module.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.jboss.resteasy.resteasy-jaxrs"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="async-http-servlet-3.0.jar"/> - <resource-root path="resteasy-jaxrs.jar"/> - </resources> - - <dependencies> - <module name="javax.api"/> - <module name="javax.annotation.api"/> - <module name="javax.ws.rs.api"/> - <module name="org.apache.commons.codec" /> - <module name="org.apache.httpcomponents" /> - <module name="org.apache.log4j"/> - <module name="org.scannotation.scannotation" /> - <module name="org.slf4j" /> - <module name="javax.servlet.api"/> - </dependencies> -</module> diff --git a/deployment/modules/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml b/deployment/modules/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml deleted file mode 100644 index 754689e..0000000 --- a/deployment/modules/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.jboss.resteasy.resteasy-jettison-provider"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="resteasy-jettison-provider.jar"/> - </resources> - - <dependencies> - <module name="org.codehaus.jettison"/> - <module name="javax.xml.bind.api"/> - <module name="javax.api"/> - <module name="javax.enterprise.api"/> - <module name="javax.servlet.api"/> - <module name="javax.ws.rs.api"/> - <module name="org.jboss.resteasy.resteasy-jaxrs"/> - <module name="org.jboss.resteasy.resteasy-jaxb-provider"/> - </dependencies> -</module> diff --git a/deployment/modules/org/jboss/resteasy/resteasy-jsapi/main/module.xml b/deployment/modules/org/jboss/resteasy/resteasy-jsapi/main/module.xml deleted file mode 100644 index b3ef339..0000000 --- a/deployment/modules/org/jboss/resteasy/resteasy-jsapi/main/module.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.jboss.resteasy.resteasy-jsapi"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="resteasy-jsapi.jar"/> - </resources> - - <dependencies> - <module name="javax.xml.bind.api"/> - <module name="javax.api"/> - <module name="javax.enterprise.api"/> - <module name="javax.servlet.api"/> - <module name="javax.ws.rs.api"/> - <module name="org.jboss.resteasy.resteasy-jaxrs"/> - </dependencies> -</module> diff --git a/deployment/modules/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml b/deployment/modules/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml deleted file mode 100644 index f15febd..0000000 --- a/deployment/modules/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.jboss.resteasy.resteasy-multipart-provider"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="resteasy-multipart-provider.jar"/> - </resources> - - <dependencies> - <module name="javax.xml.bind.api"/> - <module name="javax.api"/> - <module name="javax.enterprise.api"/> - <module name="javax.mail.api"/> - <module name="javax.servlet.api"/> - <module name="javax.ws.rs.api"/> - <module name="org.apache.james.mime4j"/> - <module name="org.jboss.resteasy.resteasy-jaxb-provider"/> - <module name="org.jboss.resteasy.resteasy-jaxrs"/> - </dependencies> -</module> diff --git a/deployment/modules/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml b/deployment/modules/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml deleted file mode 100644 index c3309bd..0000000 --- a/deployment/modules/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.jboss.resteasy.resteasy-yaml-provider"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="resteasy-yaml-provider.jar"/> - </resources> - - <dependencies> - <module name="com.sun.xml.bind"/> - <module name="javax.xml.bind.api"/> - <module name="javax.api"/> - <module name="javax.enterprise.api"/> - <module name="javax.servlet.api"/> - <module name="javax.ws.rs.api"/> - <module name="org.yaml.snakeyaml"/> - <module name="org.jboss.resteasy.resteasy-jaxrs"/> - <module name="org.jboss.resteasy.resteasy-jaxb-provider"/> - </dependencies> -</module> diff --git a/deployment/modules/org/scannotation/scannotation/main/module.xml b/deployment/modules/org/scannotation/scannotation/main/module.xml deleted file mode 100644 index 5c7d0c4..0000000 --- a/deployment/modules/org/scannotation/scannotation/main/module.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2010, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file in the - ~ distribution for a full listing of individual contributors. - ~ - ~ This is free software; you can redistribute it and/or modify it - ~ under the terms of the GNU Lesser General Public License as - ~ published by the Free Software Foundation; either version 2.1 of - ~ the License, or (at your option) any later version. - ~ - ~ This software is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ~ Lesser General Public License for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public - ~ License along with this software; if not, write to the Free - ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> - -<module xmlns="urn:jboss:module:1.1" name="org.scannotation.scannotation"> - <properties> - <property name="jboss.api" value="private"/> - </properties> - - <resources> - <resource-root path="scannotation.jar"/> - </resources> - - <dependencies> - <module name="javax.api"/> - <module name="javax.servlet.api"/> - <module name="org.javassist"/> - </dependencies> -</module> diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index f98aa42..acd3065 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -178,7 +178,7 @@ Requires: postgresql-server >= 8.4.7 # Require JBoss AS 7: -Requires: jboss-as >= 7.1.1 +Requires: jboss-as >= 7.1.1-9 # We can't require exactly the same version and release of the # setup package because it needs to be updated independely as part @@ -508,46 +508,16 @@ find %{buildroot}%{engine_jboss_modules} -type d -exec chmod 755 {} \; find %{buildroot}%{engine_jboss_modules} -type f -exec chmod 644 {} \; -# Apache commons-codec module: -ln -s `build-classpath commons-codec` %{buildroot}%{engine_jboss_modules}/org/apache/commons/codec/main/. - -# Apache HTTP components module: -ln -s `build-classpath httpcomponents/httpcore` %{buildroot}%{engine_jboss_modules}/org/apache/httpcomponents/main/. -ln -s `build-classpath httpcomponents/httpclient` %{buildroot}%{engine_jboss_modules}/org/apache/httpcomponents/main/. -ln -s `build-classpath httpcomponents/httpmime` %{buildroot}%{engine_jboss_modules}/org/apache/httpcomponents/main/. - -# Scannotation module: -ln -s `build-classpath scannotation` %{buildroot}%{engine_jboss_modules}/org/scannotation/scannotation/main/. - # JAXB module: ln -s `build-classpath glassfish-jaxb/jaxb-impl` %{buildroot}%{engine_jboss_modules}/com/sun/xml/bind/main/. ln -s `build-classpath glassfish-jaxb/jaxb-xjc` %{buildroot}%{engine_jboss_modules}/com/sun/xml/bind/main/. ln -s `build-classpath istack-commons-runtime` %{buildroot}%{engine_jboss_modules}/com/sun/xml/bind/main/. - -# JAX-RS API modules: -ln -s `build-classpath resteasy/jaxrs-api` %{buildroot}%{engine_jboss_modules}/javax/ws/rs/api/main/. - -# Resteasy modules: -ln -s `build-classpath resteasy/resteasy-cdi` %{buildroot}%{engine_jboss_modules}/org/jboss/resteasy/resteasy-cdi/main/. -ln -s `build-classpath resteasy/resteasy-jettison-provider` %{buildroot}%{engine_jboss_modules}/org/jboss/resteasy/resteasy-jettison-provider/main/. -ln -s `build-classpath resteasy/resteasy-atom-provider` %{buildroot}%{engine_jboss_modules}/org/jboss/resteasy/resteasy-atom-provider/main/. -ln -s `build-classpath resteasy/resteasy-yaml-provider` %{buildroot}%{engine_jboss_modules}/org/jboss/resteasy/resteasy-yaml-provider/main/. -ln -s `build-classpath resteasy/resteasy-multipart-provider` %{buildroot}%{engine_jboss_modules}/org/jboss/resteasy/resteasy-multipart-provider/main/. -ln -s `build-classpath resteasy/resteasy-jackson-provider` %{buildroot}%{engine_jboss_modules}/org/jboss/resteasy/resteasy-jackson-provider/main/. -ln -s `build-classpath resteasy/resteasy-jaxb-provider` %{buildroot}%{engine_jboss_modules}/org/jboss/resteasy/resteasy-jaxb-provider/main/. -ln -s `build-classpath resteasy/resteasy-jaxrs` %{buildroot}%{engine_jboss_modules}/org/jboss/resteasy/resteasy-jaxrs/main/. -ln -s `build-classpath resteasy/async-http-servlet-3.0` %{buildroot}%{engine_jboss_modules}/org/jboss/resteasy/resteasy-jaxrs/main/. -ln -s `build-classpath resteasy/resteasy-jsapi` %{buildroot}%{engine_jboss_modules}/org/jboss/resteasy/resteasy-jsapi/main/. # Jackson modules: ln -s `build-classpath jackson/jackson-jaxrs` %{buildroot}%{engine_jboss_modules}/org/codehaus/jackson/jackson-jaxrs/main/. ln -s `build-classpath jackson/jackson-core-asl` %{buildroot}%{engine_jboss_modules}/org/codehaus/jackson/jackson-core-asl/main/. ln -s `build-classpath jackson/jackson-mapper-asl` %{buildroot}%{engine_jboss_modules}/org/codehaus/jackson/jackson-mapper-asl/main/. ln -s `build-classpath jackson/jackson-xc` %{buildroot}%{engine_jboss_modules}/org/codehaus/jackson/jackson-xc/main/. - -# Hibernate validator module: -ln -s `build-classpath hibernate-validator` %{buildroot}%{engine_jboss_modules}/org/hibernate/validator/main/. -ln -s `build-classpath jtype` %{buildroot}%{engine_jboss_modules}/org/hibernate/validator/main/. # Jettison: ln -s `build-classpath jettison` %{buildroot}%{engine_jboss_modules}/org/codehaus/jettison/main -- To view, visit http://gerrit.ovirt.org/9402 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c4ece73cb8400d6e51d70cb8ae34a309675bfbc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
