You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by pt...@apache.org on 2008/04/02 00:07:53 UTC
svn commit: r643616 - in /jakarta/cactus/trunk: cactus-bin-assembly.xml
cactus-site/src/site/xdoc/news.xml cactus-src-assembly.xml
Author: ptahchiev
Date: Tue Apr 1 15:07:52 2008
New Revision: 643616
URL: http://svn.apache.org/viewvc?rev=643616&view=rev
Log:
Changed the top-level assembly descriptors.
Modified:
jakarta/cactus/trunk/cactus-bin-assembly.xml
jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml
jakarta/cactus/trunk/cactus-src-assembly.xml
Modified: jakarta/cactus/trunk/cactus-bin-assembly.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-bin-assembly.xml?rev=643616&r1=643615&r2=643616&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-bin-assembly.xml (original)
+++ jakarta/cactus/trunk/cactus-bin-assembly.xml Tue Apr 1 15:07:52 2008
@@ -100,16 +100,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>cactus-site/src/site/resources/</directory>
- <outputDirectory>documentation</outputDirectory>
- <includes>
- <include>**/apidocs/**</include>
- </includes>
- <excludes>
- <exclude>**/xref/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
<directory>descriptors/licenses</directory>
<outputDirectory>licenses</outputDirectory>
<includes>
@@ -122,6 +112,9 @@
<includes>
<include>**/*.*</include>
</includes>
+ <excludes>
+ <exclude>**/xref/**</exclude>
+ </excludes>
</fileSet>
</fileSets>
</assembly>
Modified: jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml?rev=643616&r1=643615&r2=643616&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml (original)
+++ jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml Tue Apr 1 15:07:52 2008
@@ -1,22 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-
-<document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" id="news">
+<document id="news" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<properties>
<title>Jakarta Cactus News</title>
</properties>
Modified: jakarta/cactus/trunk/cactus-src-assembly.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-src-assembly.xml?rev=643616&r1=643615&r2=643616&view=diff
==============================================================================
--- jakarta/cactus/trunk/cactus-src-assembly.xml (original)
+++ jakarta/cactus/trunk/cactus-src-assembly.xml Tue Apr 1 15:07:52 2008
@@ -36,6 +36,7 @@
<exclude>**/target/**</exclude>
<!--Linux Kate makes such temp files. -->
<exclude>**/*.*~</exclude>
+ <exclude>**/*~</exclude>
<!--Eclipse's work directory. -->
<exclude>bin/**</exclude>
<!-- svn directories. -->
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
Re: svn commit: r643616 - in /jakarta/cactus/trunk: cactus-bin-assembly.xml cactus-site/src/site/xdoc/news.xml cactus-src-assembly.xml
Posted by sebb <se...@gmail.com>.
On 01/04/2008, Petar Tahchiev <pa...@gmail.com> wrote:
> I just added it.
>
> Sorry about that - it was because on site generation the news.xml
> file in the xdoc folder gets transformed from a rdf file with a XSLT
> transformation.
> Thus, I guess it was overridden.
In that case, the transformation process needs looking at as well, surely?
> 2008/4/2, sebb <se...@gmail.com>:
>
> >
> > On 01/04/2008, ptahchiev@apache.org <pt...@apache.org> wrote:
> > > Author: ptahchiev
> > > Date: Tue Apr 1 15:07:52 2008
> > > New Revision: 643616
> > >
> > > URL: http://svn.apache.org/viewvc?rev=643616&view=rev
> > > Log:
> > > Changed the top-level assembly descriptors.
> > >
> > > Modified:
> > > jakarta/cactus/trunk/cactus-bin-assembly.xml
> > > jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml
> > > jakarta/cactus/trunk/cactus-src-assembly.xml
> > >
> > > Modified: jakarta/cactus/trunk/cactus-bin-assembly.xml
> > > URL:
> > http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-bin-assembly.xml?rev=643616&r1=643615&r2=643616&view=diff
> >
> > > ==============================================================================
> > > --- jakarta/cactus/trunk/cactus-bin-assembly.xml (original)
> > > +++ jakarta/cactus/trunk/cactus-bin-assembly.xml Tue Apr 1 15:07:52
> > 2008
> > > @@ -100,16 +100,6 @@
> > > </includes>
> > > </fileSet>
> > > <fileSet>
> > > -
> > <directory>cactus-site/src/site/resources/</directory>
> > > -
> > <outputDirectory>documentation</outputDirectory>
> > > - <includes>
> > > - <include>**/apidocs/**</include>
> > > - </includes>
> > > - <excludes>
> > > - <exclude>**/xref/**</exclude>
> > > - </excludes>
> > > - </fileSet>
> > > - <fileSet>
> > > <directory>descriptors/licenses</directory>
> > > <outputDirectory>licenses</outputDirectory>
> > > <includes>
> > > @@ -122,6 +112,9 @@
> > > <includes>
> > > <include>**/*.*</include>
> > > </includes>
> > > + <excludes>
> > > + <exclude>**/xref/**</exclude>
> > > + </excludes>
> > > </fileSet>
> > > </fileSets>
> > > </assembly>
> > >
> > > Modified: jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml
> > > URL:
> > http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml?rev=643616&r1=643615&r2=643616&view=diff
> >
> > > ==============================================================================
> > > --- jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml (original)
> > > +++ jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml Tue Apr 1
> > 15:07:52 2008
> > > @@ -1,22 +1,5 @@
> > > <?xml version="1.0" encoding="UTF-8"?>
> > > -<!--
> > > - 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.
> > > --->
> >
> >
> > Why has the AL header been deleted?
> >
> >
> > > -
> > > -<document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="
> > http://www.w3.org/1999/02/22-rdf-syntax-ns#" id="news">
> > > +<document id="news" xmlns:dc="http://purl.org/dc/elements/1.1/"
> > xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
> > > <properties>
> > > <title>Jakarta Cactus News</title>
> > > </properties>
> > >
> > > Modified: jakarta/cactus/trunk/cactus-src-assembly.xml
> > > URL:
> > http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-src-assembly.xml?rev=643616&r1=643615&r2=643616&view=diff
> >
> > > ==============================================================================
> > > --- jakarta/cactus/trunk/cactus-src-assembly.xml (original)
> > > +++ jakarta/cactus/trunk/cactus-src-assembly.xml Tue Apr 1 15:07:52
> > 2008
> > > @@ -36,6 +36,7 @@
> > > <exclude>**/target/**</exclude>
> > > <!--Linux Kate makes such temp files.
> > -->
> > > <exclude>**/*.*~</exclude>
> > > + <exclude>**/*~</exclude>
> > > <!--Eclipse's work directory. -->
> > > <exclude>bin/**</exclude>
> > > <!-- svn directories. -->
> > >
> > >
> > >
> > > ---------------------------------------------------------------------
> > > To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
> > > For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
> > >
> > >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
> >
> >
>
>
>
> --
> Regards, Petar!
> Karlovo, Bulgaria.
>
> EOOXML Objections
> http://www.grokdoc.net/index.php/EOOXML_objections
>
> Public PGP Key at:
> https://keyserver1.pgp.com/vkd/DownloadKey.event?keyid=0x19658550C3110611
> Key Fingerprint: A369 A7EE 61BC 93A3 CDFF 55A5 1965 8550 C311 0611
>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
Re: svn commit: r643616 - in /jakarta/cactus/trunk: cactus-bin-assembly.xml cactus-site/src/site/xdoc/news.xml cactus-src-assembly.xml
Posted by Petar Tahchiev <pa...@gmail.com>.
I just added it.
Sorry about that - it was because on site generation the news.xml
file in the xdoc folder gets transformed from a rdf file with a XSLT
transformation.
Thus, I guess it was overridden.
2008/4/2, sebb <se...@gmail.com>:
>
> On 01/04/2008, ptahchiev@apache.org <pt...@apache.org> wrote:
> > Author: ptahchiev
> > Date: Tue Apr 1 15:07:52 2008
> > New Revision: 643616
> >
> > URL: http://svn.apache.org/viewvc?rev=643616&view=rev
> > Log:
> > Changed the top-level assembly descriptors.
> >
> > Modified:
> > jakarta/cactus/trunk/cactus-bin-assembly.xml
> > jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml
> > jakarta/cactus/trunk/cactus-src-assembly.xml
> >
> > Modified: jakarta/cactus/trunk/cactus-bin-assembly.xml
> > URL:
> http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-bin-assembly.xml?rev=643616&r1=643615&r2=643616&view=diff
>
> > ==============================================================================
> > --- jakarta/cactus/trunk/cactus-bin-assembly.xml (original)
> > +++ jakarta/cactus/trunk/cactus-bin-assembly.xml Tue Apr 1 15:07:52
> 2008
> > @@ -100,16 +100,6 @@
> > </includes>
> > </fileSet>
> > <fileSet>
> > -
> <directory>cactus-site/src/site/resources/</directory>
> > -
> <outputDirectory>documentation</outputDirectory>
> > - <includes>
> > - <include>**/apidocs/**</include>
> > - </includes>
> > - <excludes>
> > - <exclude>**/xref/**</exclude>
> > - </excludes>
> > - </fileSet>
> > - <fileSet>
> > <directory>descriptors/licenses</directory>
> > <outputDirectory>licenses</outputDirectory>
> > <includes>
> > @@ -122,6 +112,9 @@
> > <includes>
> > <include>**/*.*</include>
> > </includes>
> > + <excludes>
> > + <exclude>**/xref/**</exclude>
> > + </excludes>
> > </fileSet>
> > </fileSets>
> > </assembly>
> >
> > Modified: jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml
> > URL:
> http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml?rev=643616&r1=643615&r2=643616&view=diff
>
> > ==============================================================================
> > --- jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml (original)
> > +++ jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml Tue Apr 1
> 15:07:52 2008
> > @@ -1,22 +1,5 @@
> > <?xml version="1.0" encoding="UTF-8"?>
> > -<!--
> > - 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.
> > --->
>
>
> Why has the AL header been deleted?
>
>
> > -
> > -<document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="
> http://www.w3.org/1999/02/22-rdf-syntax-ns#" id="news">
> > +<document id="news" xmlns:dc="http://purl.org/dc/elements/1.1/"
> xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
> > <properties>
> > <title>Jakarta Cactus News</title>
> > </properties>
> >
> > Modified: jakarta/cactus/trunk/cactus-src-assembly.xml
> > URL:
> http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-src-assembly.xml?rev=643616&r1=643615&r2=643616&view=diff
>
> > ==============================================================================
> > --- jakarta/cactus/trunk/cactus-src-assembly.xml (original)
> > +++ jakarta/cactus/trunk/cactus-src-assembly.xml Tue Apr 1 15:07:52
> 2008
> > @@ -36,6 +36,7 @@
> > <exclude>**/target/**</exclude>
> > <!--Linux Kate makes such temp files.
> -->
> > <exclude>**/*.*~</exclude>
> > + <exclude>**/*~</exclude>
> > <!--Eclipse's work directory. -->
> > <exclude>bin/**</exclude>
> > <!-- svn directories. -->
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
>
>
--
Regards, Petar!
Karlovo, Bulgaria.
EOOXML Objections
http://www.grokdoc.net/index.php/EOOXML_objections
Public PGP Key at:
https://keyserver1.pgp.com/vkd/DownloadKey.event?keyid=0x19658550C3110611
Key Fingerprint: A369 A7EE 61BC 93A3 CDFF 55A5 1965 8550 C311 0611
Re: svn commit: r643616 - in /jakarta/cactus/trunk: cactus-bin-assembly.xml cactus-site/src/site/xdoc/news.xml cactus-src-assembly.xml
Posted by sebb <se...@gmail.com>.
On 01/04/2008, ptahchiev@apache.org <pt...@apache.org> wrote:
> Author: ptahchiev
> Date: Tue Apr 1 15:07:52 2008
> New Revision: 643616
>
> URL: http://svn.apache.org/viewvc?rev=643616&view=rev
> Log:
> Changed the top-level assembly descriptors.
>
> Modified:
> jakarta/cactus/trunk/cactus-bin-assembly.xml
> jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml
> jakarta/cactus/trunk/cactus-src-assembly.xml
>
> Modified: jakarta/cactus/trunk/cactus-bin-assembly.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-bin-assembly.xml?rev=643616&r1=643615&r2=643616&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/cactus-bin-assembly.xml (original)
> +++ jakarta/cactus/trunk/cactus-bin-assembly.xml Tue Apr 1 15:07:52 2008
> @@ -100,16 +100,6 @@
> </includes>
> </fileSet>
> <fileSet>
> - <directory>cactus-site/src/site/resources/</directory>
> - <outputDirectory>documentation</outputDirectory>
> - <includes>
> - <include>**/apidocs/**</include>
> - </includes>
> - <excludes>
> - <exclude>**/xref/**</exclude>
> - </excludes>
> - </fileSet>
> - <fileSet>
> <directory>descriptors/licenses</directory>
> <outputDirectory>licenses</outputDirectory>
> <includes>
> @@ -122,6 +112,9 @@
> <includes>
> <include>**/*.*</include>
> </includes>
> + <excludes>
> + <exclude>**/xref/**</exclude>
> + </excludes>
> </fileSet>
> </fileSets>
> </assembly>
>
> Modified: jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml?rev=643616&r1=643615&r2=643616&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml (original)
> +++ jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml Tue Apr 1 15:07:52 2008
> @@ -1,22 +1,5 @@
> <?xml version="1.0" encoding="UTF-8"?>
> -<!--
> - 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.
> --->
Why has the AL header been deleted?
> -
> -<document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" id="news">
> +<document id="news" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
> <properties>
> <title>Jakarta Cactus News</title>
> </properties>
>
> Modified: jakarta/cactus/trunk/cactus-src-assembly.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-src-assembly.xml?rev=643616&r1=643615&r2=643616&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/cactus-src-assembly.xml (original)
> +++ jakarta/cactus/trunk/cactus-src-assembly.xml Tue Apr 1 15:07:52 2008
> @@ -36,6 +36,7 @@
> <exclude>**/target/**</exclude>
> <!--Linux Kate makes such temp files. -->
> <exclude>**/*.*~</exclude>
> + <exclude>**/*~</exclude>
> <!--Eclipse's work directory. -->
> <exclude>bin/**</exclude>
> <!-- svn directories. -->
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org