Skip to content

Commit

Permalink
[NETBEANS-54] Module review websvc.saas.*
Browse files Browse the repository at this point in the history
The XSD Schema files for the WADL definitions were imported into the source
and the license was narrowed down to explicitly elect the CDDL for
redistribution.
  • Loading branch information
matthiasblaesing committed Nov 30, 2017
1 parent 3ba0a27 commit 9164018
Show file tree
Hide file tree
Showing 11 changed files with 685 additions and 429 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/jaxb/
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl20061109.xsd
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/private/
/xml/test/qa-functional/data/ActionsTestProject/nbproject/private/
/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/private/
Expand Down
4 changes: 4 additions & 0 deletions nbbuild/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2155,6 +2155,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="testng.ui/src/org/netbeans/modules/testng/ui/resources/*.template" /> <!--template files-->
<exclude name="utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*" /> <!--test data-->
<exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/*.template" /> <!--template files-->
<exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/*.xsd" /> <!-- XSDs for usage at runtime and code generation - the XSDs are not modified, so covered by https://www.apache.org/legal/resolved.html#category-b -->
<exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/jaxb/*" /> <!-- generated code -->
<exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/*" /> <!-- generated code -->
<exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/*" /> <!-- generated code -->
<exclude name="websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/application.wadl" /> <!--test data-->
<exclude name="websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/rootGroup.xml" /> <!--test data-->
<exclude name="welcome/src/org/netbeans/modules/welcome/resources/rss-0_91.dtd" /> <!-- specifies a standard -->
Expand Down
4 changes: 0 additions & 4 deletions websvc.saas.api/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@
<property name="oauth.xsd" value="src/org/netbeans/modules/websvc/saas/model/oauth-metadata.xsd"/>
<property name="oauth.model" value="src/org/netbeans/modules/websvc/saas/model/oauth"/>

<target name="build-init" depends="projectized.build-init">
<unzip src="external/websvc-saas-api-external-resources-8.2.zip" dest="src/org/netbeans/modules/websvc/saas/model"/>
</target>

<target name="xjc-init" depends="build-init">
<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
<classpath>
Expand Down
17 changes: 0 additions & 17 deletions websvc.saas.api/external/binaries-list

This file was deleted.

Loading

0 comments on commit 9164018

Please sign in to comment.