Author: michiel
Date: 2010-04-20 19:33:58 +0200 (Tue, 20 Apr 2010)
New Revision: 41997
Removed:
mmbase/trunk/applications/rmmci/assembly/client.xml
Modified:
mmbase/trunk/applications/rmmci/assembly/client-skinny.xml
mmbase/trunk/applications/rmmci/pom.xml
Log:
dropped that horrible stuff with 'skinny' vs normal client jars. Only providing
skinny now. Proivde mmbase-bridge and mmbase-util to your client if they are
not mmbase themselves.
Modified: mmbase/trunk/applications/rmmci/assembly/client-skinny.xml
===================================================================
--- mmbase/trunk/applications/rmmci/assembly/client-skinny.xml 2010-04-20
17:29:37 UTC (rev 41996)
+++ mmbase/trunk/applications/rmmci/assembly/client-skinny.xml 2010-04-20
17:33:58 UTC (rev 41997)
@@ -1,5 +1,5 @@
<assembly>
- <id>client-skinny</id>
+ <id>client</id>
<formats>
<format>jar</format>
</formats>
Deleted: mmbase/trunk/applications/rmmci/assembly/client.xml
===================================================================
--- mmbase/trunk/applications/rmmci/assembly/client.xml 2010-04-20 17:29:37 UTC
(rev 41996)
+++ mmbase/trunk/applications/rmmci/assembly/client.xml 2010-04-20 17:33:58 UTC
(rev 41997)
@@ -1,128 +0,0 @@
-<assembly>
- <id>client</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>org.mmbase:mmbase:jar</include>
- </includes>
- <unpack>true</unpack>
- <scope>provided</scope>
-
- <unpackOptions>
- <includes>
- <include>org/mmbase/bridge/**</include> <!-- of course
-->
- <include>org/mmbase/bridge/util/**</include> <!--
not essential, but the idea is that you could use those with any bridge impl,
so you should want them -->
- <include>org/mmbase/storage/search/*</include> <!--
those interfaces are part of bridge -->
-
-
- <include>org/mmbase/datatypes/**</include> <!-- datatype
classes are bridge -->
- <include>org/mmbase/security/UserContext.class</include> <!--
security classes are bridge -->
- <include>org/mmbase/security/BasicUser.class</include> <!--
security classes are bridge -->
- <include>org/mmbase/security/AuthenticationData*.class</include>
<!-- security classes are bridge -->
- <include>org/mmbase/security/Authentication*.class</include> <!--
security classes are bridge -->
- <include>org/mmbase/security/NoAuthentication*.class</include> <!--
security classes are bridge -->
- <include>org/mmbase/security/Rank.class</include> <!--
security classes are bridge -->
- <include>org/mmbase/security/SecurityException.class</include> <!--
security classes are bridge -->
- <include>org/mmbase/security/Action*.class</include> <!-- security
classes are bridge -->
- <include>org/mmbase/security/Operation*.class</include> <!--
security classes are bridge -->
- <include>org/mmbase/security/Configurable*.class</include> <!--
security classes are bridge -->
-
- <include>org/mmbase/util/functions/**</include> <!--
functions are bridge -->
-
- <include>org/mmbase/cache/CachePolicy*</include> <!--
used in bridge -->
- <include>org/mmbase/cache/Cache*</include> <!-- used by
SortedBundle, but any how it is utility -->
- <include>org/mmbase/cache/**</include> <!-- used by
SortedBundle, but any how it is utility -->
- <include>org/mmbase/util/LRUHashtable*</include> <!--
cache implementation -->
-
- <!-- perhaps we need _all_ of util ? -->
- <include>org/mmbase/util/logging/**</include> <!--
every class use, and it's no real burden to have it -->
- <include>org/mmbase/util/ResourceLoader*.class</include> <!--
well... -->
- <include>org/mmbase/util/ResourceWatcher*.class</include> <!--
-->
-
<include>org/mmbase/util/NodeURLStreamHandlerFactory*.class</include> <!--
-->
- <include>org/mmbase/util/LocalizedString.class</include>
<!-- returned by bridge -->
- <include>org/mmbase/util/LocaleCollator*</include> <!--
returned by bridge -->
- <include>org/mmbase/util/ReadonlyLocalizedString.class</include>
- <include>org/mmbase/util/ReplacingLocalizedString*.class</include>
<!-- returned by bridge -->
-
<include>org/mmbase/util/EncodingDetectingOutputStreamWriter.class</include>
<!-- used by resourceloader -->
- <include>org/mmbase/util/FileWatcher*.class</include>
<!-- used by resourceloader -->
- <include>org/mmbase/util/Entry.class</include> <!-- used
by LocalizedString -->
- <include>org/mmbase/util/LocalizedEntryListFactory*.class</include>
<!-- returned by DataType -->
- <include>org/mmbase/util/SortedBundle*.class</include>
<!-- Used by LocalizedEntryListFactory -->
- <include>org/mmbase/util/ChainedIterator*.class</include>
<!-- Used by LocalizedEntryListFactory -->
- <include>org/mmbase/util/SizeMeasurable.class</include>
<!-- implemented by several class -->
- <include>org/mmbase/util/Casting*.class</include>
<!-- widely used -->
- <include>org/mmbase/util/StringBuilderWriter.class</include>
<!-- used by Casting -->
- <include>org/mmbase/util/StringBufferWriter.class</include>
<!-- used by Datatype Restrictions -->
- <include>org/mmbase/util/WrappedLocalizedString.class</include>
<!-- used by Casting -->
- <include>org/mmbase/util/Encode.class</include>
<!-- general utility -->
- <include>org/mmbase/util/transformers/**.class</include>
<!-- used by Encode -->
- <include>org/mmbase/util/xml/**</include>
- <include>org/mmbase/util/XMLEntityResolver*.class</include>
<!-- -->
- <include>org/mmbase/util/XMLErrorHandler.class</include>
<!-- -->
- <include>org/mmbase/util/DynamicDate.class</include>
<!-- used by Casting -->
- <include>org/mmbase/util/DateFormats*.class</include>
- <include>org/mmbase/util/dateparser/**</include>
<!-- used by Casting -->
- <include>org/mmbase/util/HashCodeUtil*</include>
<!-- used by SortedBundle, but is generic tool-->
- <include>org/mmbase/util/PublicCloneable*</include>
<!-- used by SortedBundle, but is generic tool-->
- <include>org/mmbase/util/StringSplitter*</include>
<!-- used by Queries-->
- <include>org/mmbase/util/SerializableInputStream*</include>
<!-- Representation of binaries-->
- <include>org/mmbase/util/NullInputStream*</include>
- <include>org/mmbase/util/RandomInputStream*</include>
- <include>org/mmbase/util/MockInputStream*</include>
- <include>org/mmbase/util/ThreadPools*</include>
- <include>org/mmbase/util/IOUtil*</include>
- <include>org/mmbase/util/SizeOf*</include>
- <include>org/mmbase/util/MimeType*</include>
- <include>org/mmbase/util/magicfile/*</include>
- <include>org/mmbase/util/magicfile/resources/*</include>
- <include>org/mmbase/config/magic.xml</include>
-
- <include>org/mmbase/util/ChainedList*.class</include>
<!-- Used by Mock -->
- <include>org/mmbase/util/LinkMap*.class</include> <!--
Used by Mock -->
- <include>org/mmbase/storage/search/implementation/**</include> <!--
Used by Mock, test cases -->
- <include>org/mmbase/core/util/Fields**</include> <!--
hmm -->
-
-
- <include>org/mmbase/storage/Storable.class</include>
<!-- DataTypes uses .. -->
- <include>org/mmbase/storage/StorageException.class</include>
<!-- -->
- <include>org/mmbase/storage/StorageNotFoundException.class</include>
<!-- may be thrown through bridge. -->
-
-
- <include>org/mmbase/core/util/Fields.class</include>
<!-- DataTypes uses .. -->
- <include>org/mmbase/core/*.class</include> <!--
DataTypes uses .. -->
- <include>org/mmbase/core/event/**</include>
-
- <include>org/mmbase/module/corebuilders/FieldDefs.class</include>
<!-- DataTypes uses .. -->
-
- <include>org/mmbase/util/RandomPool*</include> <!-- Used in
test cases .. -->
- <include>org/mmbase/util/PasswordGenerator*</include>
<!-- Used in test cases .. -->
- <include>org/mmbase/util/BridgeCaster*</include>
- <include>org/mmbase/config/functions/**</include>
<!-- Used in test cases .. -->
- <include>org/mmbase/config/datatypes.xml</include>
<!-- Used in test cases .. -->
- <include>org/mmbase/config/builders/core/**</include>
<!-- Used in Mock/test cases .. -->
- <include>org/mmbase/config/utils/resourceloader**</include>
-
-
- <include>org/mmbase/framework/**</include> <!--
Used in taglib .. -->
- <include>org/mmbase/util/externalprocess/**</include>
<!-- Used in taglib .. -->
- <include>org/mmbase/util/ReaderInputStream*</include>
<!-- Used in taglib .. -->
- <include>org/mmbase/util/ExprCalc*</include> <!--
Used in taglib .. -->
- </includes>
- <excludes>
- <exclude>org/mmbase/storage/search/SearchQueryHandler*</exclude>
<!-- Has a dependency on MMObjectNode -->
- </excludes>
-
- </unpackOptions>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
Modified: mmbase/trunk/applications/rmmci/pom.xml
===================================================================
--- mmbase/trunk/applications/rmmci/pom.xml 2010-04-20 17:29:37 UTC (rev
41996)
+++ mmbase/trunk/applications/rmmci/pom.xml 2010-04-20 17:33:58 UTC (rev
41997)
@@ -23,7 +23,7 @@
<dependencies>
<dependency>
<groupId>org.mmbase</groupId>
- <artifactId>mmbase</artifactId>
+ <artifactId>mmbase-bridge</artifactId>
<version>${mmbase.version}</version>
</dependency>
<dependency>
@@ -85,7 +85,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>assembly/client.xml</descriptor>
<descriptor>assembly/client-skinny.xml</descriptor>
<descriptor>examples-assembly.xml</descriptor>
</descriptors>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
