This repository has been archived by the owner on Apr 8, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GTNPORTAL-2957: extracted shindig-related dependencies into a module …
…to prevent issues with ehcache and jbossws-cxf with wsrp and wss :( - Created org.gatein.shindig module - Created org.json module used both by org.gatein.lib and org.gatein.shindig - Cleaned-up org.gatein.lib module - Added MANIFEST dependencies on org.gatein.shindig module in eXoGadgetServer war
- Loading branch information
Showing
5 changed files
with
153 additions
and
22 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
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
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
49 changes: 49 additions & 0 deletions
49
packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/shindig/main/module.xml
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 |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| <?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.gatein.shindig"> | ||
| <resources> | ||
| <!-- Insert resources here --> | ||
| </resources> | ||
|
|
||
| <dependencies> | ||
| <module name="javax.inject.api"/> | ||
| <module name="javax.servlet.api"/> | ||
| <module name="javax.api"/> | ||
| <module name="javax.transaction.api"/> | ||
| <module name="javax.el.api"/> | ||
| <module name="org.json"/> | ||
| <module name="org.joda.time"/> | ||
| <module name="org.slf4j"/> | ||
| <module name="com.google.guava" slot="gatein"/> | ||
| <module name="org.apache.commons.lang"/> | ||
| <module name="org.apache.commons.codec"/> | ||
| <module name="org.apache.httpcomponents"/> | ||
| <module name="org.apache.xerces"/> | ||
| <module name="org.gatein.lib"/> | ||
| <module name="org.apache.commons.io"/> | ||
| <module name="org.apache.commons-fileupload"/> | ||
| <module name="org.jaxen"/> | ||
| </dependencies> | ||
| </module> |
32 changes: 32 additions & 0 deletions
32
packaging/jboss-as7/modules/src/main/resources/modules/org/json/main/module.xml
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 |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <?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.json"> | ||
| <resources> | ||
| <!-- Insert resources here --> | ||
| </resources> | ||
|
|
||
| <dependencies> | ||
| </dependencies> | ||
| </module> |