[Orca-checkins] rev 221 - in branches/orca/import_orca_services_2.0: . lib data_gatherers

blair at orcaware.com blair at orcaware.com
Mon Mar 24 22:14:50 PST 2003


Author: blair
Date: 2003-03-24 22:14:25 -0800 (Mon, 24 Mar 2003)
New Revision: 221

Added:
   branches/orca/import_orca_services_2.0/data_gatherers/orca_services/
   branches/orca/import_orca_services_2.0/lib/Orca_services/
Removed:
   branches/orca/import_orca_services_2.0/data_gatherers/Orca_Services/
   branches/orca/import_orca_services_2.0/lib/Orca_Services/
Modified:
   branches/orca/import_orca_services_2.0/Makefile.in
   branches/orca/import_orca_services_2.0/configure.in
   branches/orca/import_orca_services_2.0/data_gatherers/Makefile.in
   branches/orca/import_orca_services_2.0/lib/Makefile.in
Log:
In the import_orca_services_2.0 branch, more files and directories
were renamed from orca_services to Orca_Services than originally
intended.  Back out all of these renames to bring the branch back to
the point where orca_services 2.0 was checked in, revision 207, using
svn merge -r 211:207.  At this commit, revision 211 is the last
revision that modified this branch.


Modified: branches/orca/import_orca_services_2.0/Makefile.in
==============================================================================
--- branches/orca/import_orca_services_2.0/Makefile.in	(original)
+++ branches/orca/import_orca_services_2.0/Makefile.in	2003-03-24 22:14:44.000000000 -0800
@@ -50,8 +50,8 @@
 orcallator_run_at_boot:
 	cd data_gatherers/orcallator && $(MAKE) orcallator_run_at_boot
 
-Orca_Services_run_at_boot:
-	cd data_gatherers/Orca_Services && $(MAKE) Orca_Services_run_at_boot
+orca_services_run_at_boot:
+	cd data_gatherers/orca_services && $(MAKE) orca_services_run_at_boot
 
 test_modules:
 	cd packages && $(MAKE) CFLAGS="$(CFLAGS)" test_modules

Modified: branches/orca/import_orca_services_2.0/configure.in
==============================================================================
--- branches/orca/import_orca_services_2.0/configure.in	(original)
+++ branches/orca/import_orca_services_2.0/configure.in	2003-03-24 22:14:45.000000000 -0800
@@ -510,14 +510,14 @@
           contrib/rotate_orca_graphs/rotate_orca_graphs.sh
           data_gatherers/Makefile
           $ORCALLATOR_OUTPUT
-          data_gatherers/Orca_Services/Makefile
-          data_gatherers/Orca_Services/Orca_Services.cfg
-          data_gatherers/Orca_Services/Orca_Services.pl
-          data_gatherers/Orca_Services/Orca_Services_running.pl
-          data_gatherers/Orca_Services/restart_Orca_Services.sh
-          data_gatherers/Orca_Services/start_Orca_Services.sh
-          data_gatherers/Orca_Services/stop_Orca_Services.sh
-          data_gatherers/Orca_Services/S99Orca_Services.sh
+          data_gatherers/orca_services/Makefile
+          data_gatherers/orca_services/orca_services.cfg
+          data_gatherers/orca_services/orca_services.pl
+          data_gatherers/orca_services/orca_services_running.pl
+          data_gatherers/orca_services/restart_orca_services.sh
+          data_gatherers/orca_services/start_orca_services.sh
+          data_gatherers/orca_services/stop_orca_services.sh
+          data_gatherers/orca_services/S99orca_services.sh
           docs/Makefile
           lib/Makefile
           packages/Makefile

Modified: branches/orca/import_orca_services_2.0/lib/Makefile.in
==============================================================================
--- branches/orca/import_orca_services_2.0/lib/Makefile.in	(original)
+++ branches/orca/import_orca_services_2.0/lib/Makefile.in	2003-03-24 22:14:45.000000000 -0800
@@ -30,7 +30,7 @@
 	$(MKDIR) $(libdir)/Orca
 	$(MKDIR) $(libdir)/SE/3.2.1
 	$(MKDIR) $(libdir)/SE/3.3
-	$(MKDIR) $(libdir)/Orca_Services
+	$(MKDIR) $(libdir)/Orca_services
 	@for f in Orca/*.pm; do \
 	  echo $(INSTALL) -m 0644 $$f $(libdir)/Orca; \
 	  $(INSTALL) -m 0644 $$f $(libdir)/Orca; \
@@ -50,9 +50,9 @@
 	  echo $(INSTALL) -m 0644 $$f $(libdir)/SE/3.3; \
 	  $(INSTALL) -m 0644 $$f $(libdir)/SE/3.3; \
 	done
-	@for f in Orca_Services/*; do \
-	  echo $(INSTALL) -m 0644 $$f $(libdir)/Orca_Services; \
-	  $(INSTALL) -m 0644 $$f $(libdir)/Orca_Services; \
+	@for f in Orca_services/*; do \
+	  echo $(INSTALL) -m 0644 $$f $(libdir)/Orca_services; \
+	  $(INSTALL) -m 0644 $$f $(libdir)/Orca_services; \
 	done
 
 clean:

Copied: Orca_services (from rev 207, branches/orca/import_orca_services_2.0/lib/Orca_services)

Modified: branches/orca/import_orca_services_2.0/data_gatherers/Makefile.in
==============================================================================
--- branches/orca/import_orca_services_2.0/data_gatherers/Makefile.in	(original)
+++ branches/orca/import_orca_services_2.0/data_gatherers/Makefile.in	2003-03-24 22:14:45.000000000 -0800
@@ -1,7 +1,7 @@
 @SET_MAKE@
 
 SUBDIRS               = orcallator \
-                        Orca_Services
+                        orca_services
 
 all:	Makefile $(TARGETS)
 	@for dir in $(SUBDIRS); do \
@@ -12,8 +12,8 @@
 orcallator_run_at_boot:
 	cd orcallator && $(MAKE) orcallator_run_at_boot
 
-Orca_Services_run_at_boot:
-	cd Orca_Services && $(MAKE) Orca_Services_run_at_boot
+orca_services_run_at_boot:
+	cd orca_services && $(MAKE) orca_services_run_at_boot
 
 install:
 	@for dir in $(SUBDIRS); do \

Copied: orca_services (from rev 207, branches/orca/import_orca_services_2.0/data_gatherers/orca_services)



More information about the Orca-checkins mailing list