Repository: flex-asjs Updated Branches: refs/heads/svg-rename 66b6d4231 -> 84a1b2eeb
I think I changed the svg namespaces. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/84a1b2ee Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/84a1b2ee Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/84a1b2ee Branch: refs/heads/svg-rename Commit: 84a1b2eeb8c9aa69cadf7e52fac56b71ffb7c2db Parents: 66b6d42 Author: Harbs <[email protected]> Authored: Mon Jul 25 13:06:00 2016 +0300 Committer: Harbs <[email protected]> Committed: Mon Jul 25 13:06:00 2016 +0300 ---------------------------------------------------------------------- distribution/src/main/assembly/component.xml | 7 ++++- .../main/resources/frameworks/flex-config.xml | 6 +++- frameworks/projects/Graphics/pom.xml | 4 +++ .../src/main/resources/basic-manifest.xml | 9 ------ .../src/main/resources/svg-manifest.xml | 30 ++++++++++++++++++++ 5 files changed, 45 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84a1b2ee/distribution/src/main/assembly/component.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml index 689409a..c74bef0 100644 --- a/distribution/src/main/assembly/component.xml +++ b/distribution/src/main/assembly/component.xml @@ -252,6 +252,11 @@ under the License. <destName>basic-manifest-graphics.xml</destName> </file> <file> + <source>../frameworks/projects/Graphics/src/main/resources/svg-manifest.xml</source> + <outputDirectory>frameworks/manifests</outputDirectory> + <destName>svg-manifest-graphics.xml</destName> + </file> + <file> <source>../frameworks/projects/HTML/src/main/resources/basic-as-manifest.xml</source> <outputDirectory>frameworks/manifests</outputDirectory> <destName>basic-as-manifest-html.xml</destName> @@ -264,7 +269,7 @@ under the License. <file> <source>../frameworks/projects/HTML/src/main/resources/svg-manifest.xml</source> <outputDirectory>frameworks/manifests</outputDirectory> - <destName>svg-manifest.xml</destName> + <destName>svg-manifest-html.xml</destName> </file> <file> <source>../frameworks/projects/HTML5/src/main/resources/html5-manifest.xml</source> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84a1b2ee/distribution/src/main/resources/frameworks/flex-config.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/resources/frameworks/flex-config.xml b/distribution/src/main/resources/frameworks/flex-config.xml index 922c964..fe63127 100644 --- a/distribution/src/main/resources/frameworks/flex-config.xml +++ b/distribution/src/main/resources/frameworks/flex-config.xml @@ -184,7 +184,11 @@ </namespace> <namespace> <uri>library://ns.apache.org/flexjs/svg</uri> - <manifest>manifests/svg-manifest.xml</manifest> + <manifest>manifests/svg-manifest-html.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/svg</uri> + <manifest>manifests/svg-manifest-graphics.xml</manifest> </namespace> </namespaces> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84a1b2ee/frameworks/projects/Graphics/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/pom.xml b/frameworks/projects/Graphics/pom.xml index e83241f..6e14fb9 100644 --- a/frameworks/projects/Graphics/pom.xml +++ b/frameworks/projects/Graphics/pom.xml @@ -47,6 +47,10 @@ <uri>library://ns.apache.org/flexjs/basic</uri> <manifest>${project.basedir}/src/main/resources/basic-manifest.xml</manifest> </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/svg</uri> + <manifest>${project.basedir}/src/main/resources/svg-manifest.xml</manifest> + </namespace> </namespaces> <includeClasses> <includeClass>GraphicsClasses</includeClass> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84a1b2ee/frameworks/projects/Graphics/src/main/resources/basic-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/resources/basic-manifest.xml b/frameworks/projects/Graphics/src/main/resources/basic-manifest.xml index c84644e..a1496b2 100644 --- a/frameworks/projects/Graphics/src/main/resources/basic-manifest.xml +++ b/frameworks/projects/Graphics/src/main/resources/basic-manifest.xml @@ -20,16 +20,7 @@ <componentPackage> - - <component id="Circle" class="org.apache.flex.svg.Circle" /> - <component id="Ellipse" class="org.apache.flex.svg.Ellipse" /> - <component id="Path" class="org.apache.flex.svg.Path" /> - <component id="Rect" class="org.apache.flex.svg.Rect" /> - <component id="CompoundGraphic" class="org.apache.flex.svg.CompoundGraphic" /> - <component id="GraphicContainer" class="org.apache.flex.svg.GraphicContainer" /> <component id="GradientEntry" class="org.apache.flex.graphics.GradientEntry" /> - <component id="LinearGradient" class="org.apache.flex.svg.LinearGradient" /> <component id="SolidColor" class="org.apache.flex.graphics.SolidColor" /> <component id="SolidColorStroke" class="org.apache.flex.graphics.SolidColorStroke" /> - </componentPackage> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/84a1b2ee/frameworks/projects/Graphics/src/main/resources/svg-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/resources/svg-manifest.xml b/frameworks/projects/Graphics/src/main/resources/svg-manifest.xml new file mode 100644 index 0000000..0b49d33 --- /dev/null +++ b/frameworks/projects/Graphics/src/main/resources/svg-manifest.xml @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> + + +<componentPackage> + <component id="Circle" class="org.apache.flex.svg.Circle" /> + <component id="Ellipse" class="org.apache.flex.svg.Ellipse" /> + <component id="Path" class="org.apache.flex.svg.Path" /> + <component id="Rect" class="org.apache.flex.svg.Rect" /> + <component id="CompoundGraphic" class="org.apache.flex.svg.CompoundGraphic" /> + <component id="GraphicContainer" class="org.apache.flex.svg.GraphicContainer" /> + <component id="LinearGradient" class="org.apache.flex.svg.LinearGradient" /> +</componentPackage>
