[zopeorg-checkins] CVS: NZO_SiteLayout - cvs.mk:1.9 zproduct_targets.mk:1.7

[Sidnei da Silva]

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv32375

Modified Files:
	cvs.mk zproduct_targets.mk 
Log Message:
Adding ZWiki and BackTalk in place of CMFWiki and removing CMFLDAP

=== NZO_SiteLayout/cvs.mk 1.8 => 1.9 ===
 ZOPE_CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-repository
 SQUID_CVS_REPOSITORY=:pserver:anoncvs at cvs.squid-cache.org:/squid
 ZOPEORG_CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-zopeorg
+COLLECTIVE_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/collective
+ZWIKI_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/zwiki
+BACKTALK_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/backtalk
 
 CVS=CVS_RSH=ssh /usr/bin/cvs -z7 -q
 CVS_UPDATE=${CVS} update -dP


=== NZO_SiteLayout/zproduct_targets.mk 1.6 => 1.7 ===
 src/ZopeOrg-NV: CVS_MODULE=Products/ZopeOrg-NV
 src/ZopeOrg-NV: CVS_TAG=
 
-src/CMFLDAP-1.4: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY}
-src/CMFLDAP-1.4: CVS_MODULE=Products/CMFLDAP-1.4
-src/CMFLDAP-1.4: CVS_TAG=
-
 src/BTreeFolder2-0.5: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY}
 src/BTreeFolder2-0.5: CVS_MODULE=Products/BTreeFolder2
 src/BTreeFolder2-0.5: CVS_TAG=
@@ -27,61 +23,66 @@
 src/CMFDateIndexes-NV: CVS_MODULE=Products/CMFDateIndexes-NV
 src/CMFDateIndexes-NV: CVS_TAG=
 
-src/LDAPUserFolder-1.5b1: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY}
-src/LDAPUserFolder-1.5b1: CVS_MODULE=Products/LDAPUserFolder-1.5b1
-src/LDAPUserFolder-1.5b1: CVS_TAG=
-
-src/CMFWiki-head: CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-repository
-src/CMFWiki-head: CVS_MODULE=CMF/CMFWiki
-src/CMFWiki-head: CVS_TAG=
+src/ZWiki: CVS_REPOSITORY=${ZWIKI_CVS_REPOSITORY}
+src/ZWiki: CVS_MODULE=zwiki
+src/ZWiki: CVS_TAG=
+
+src/BackTalk: CVS_REPOSITORY=${BACKTALK_CVS_REPOSITORY}
+src/BackTalk: CVS_MODULE=BackTalk
+src/BackTalk: CVS_TAG=
+
+src/CMFBackTalk: CVS_REPOSITORY=${COLLECTIVE_CVS_REPOSITORY}
+src/CMFBackTalk: CVS_MODULE=CMFBackTalk
+src/CMFBackTalk: CVS_TAG=
 
 PRODUCT_CHECKOUTS=\
-src/CMFLDAP-1.4 \
 src/ZopeOrg-NV \
 src/BTreeFolder2-0.5 \
 src/Rewriter-NV \
 src/DateIndexes-NV \
 src/CMFDateIndexes-NV \
-src/LDAPUserFolder-1.5b1 \
-src/CMFWiki-head \
+src/ZWiki \
+src/BackTalk \
+src/CMFBackTalk \
 
-opt/CMFLDAP: src/CMFLDAP-1.4
 opt/ZopeOrg: src/ZopeOrg-NV
 opt/BTreeFolder2: src/BTreeFolder2-0.5
 opt/Rewriter: src/Rewriter-NV
 opt/DateIndexes: src/DateIndexes-NV
 opt/CMFDateIndexes: src/CMFDateIndexes-NV
-opt/LDAPUserFolder: src/LDAPUserFolder-1.5b1
-opt/CMFWiki: src/CMFWiki-head
+opt/ZWiki: src/ZWiki
+opt/BackTalk: src/BackTalk
+opt/CMFBackTalk: src/CMFBackTalk
 
 PRODUCT_OPT_TARGETS=\
-opt/CMFLDAP \
 opt/ZopeOrg \
 opt/BTreeFolder2 \
 opt/Rewriter \
 opt/DateIndexes \
 opt/CMFDateIndexes \
-opt/LDAPUserFolder \
-opt/CMFWiki \
+opt/ZWiki \
+opt/BackTalk \
+opt/CMFBackTalk \
 
-${PRODUCTS_DIRECTORY}/CMFLDAP: opt/CMFLDAP
 ${PRODUCTS_DIRECTORY}/ZopeOrg: opt/ZopeOrg
 ${PRODUCTS_DIRECTORY}/BTreeFolder2: opt/BTreeFolder2
 ${PRODUCTS_DIRECTORY}/Rewriter: opt/Rewriter
 ${PRODUCTS_DIRECTORY}/DateIndexes: opt/DateIndexes
 ${PRODUCTS_DIRECTORY}/CMFDateIndexes: opt/CMFDateIndexes
-${PRODUCTS_DIRECTORY}/LDAPUserFolder: opt/LDAPUserFolder
-${PRODUCTS_DIRECTORY}/CMFWiki: opt/CMFWiki
+${PRODUCTS_DIRECTORY}/ZWiki: opt/ZWiki
+${PRODUCTS_DIRECTORY}/BackTalk: opt/BackTalk
+${PRODUCTS_DIRECTORY}/CMFBackTalk: opt/CMFBackTalk
+
 
 PRODUCT_VAR_TARGETS=\
-${PRODUCTS_DIRECTORY}/CMFLDAP \
 ${PRODUCTS_DIRECTORY}/ZopeOrg \
 ${PRODUCTS_DIRECTORY}/BTreeFolder2 \
 ${PRODUCTS_DIRECTORY}/Rewriter \
 ${PRODUCTS_DIRECTORY}/DateIndexes \
 ${PRODUCTS_DIRECTORY}/CMFDateIndexes \
-${PRODUCTS_DIRECTORY}/LDAPUserFolder \
-${PRODUCTS_DIRECTORY}/CMFWiki \
+${PRODUCTS_DIRECTORY}/ZWiki \
+${PRODUCTS_DIRECTORY}/BackTalk \
+${PRODUCTS_DIRECTORY}/CMFBackTalk \
 
 CMF_INSTANCE_TARGETS=\
 ${PRODUCTS_DIRECTORY}/CMFCore \